Update all #include directives to the currently preferred style.

[pspp-builds.git] / src / libpspp / deque.h

diff --git a/src/libpspp/deque.h b/src/libpspp/deque.h
index be1121bfe7ab22f3bd794e36429d07190226472a..151308013cf560a72cd31f670f144d1a97f53297 100644 (file)
--- a/src/libpspp/deque.h
+++ b/src/libpspp/deque.h
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 /* Deque data structure.
 
@@ -56,7 +54,7 @@
         if (deque_is_full (&deque))
           data = deque_expand (&deque, data, sizeof *data);
         data[deque_push_back (&deque)] = x;
-        
+
    Expanding a deque will copy its elements from one memory
    region to another using memcpy.  Thus, your deque elements
    must tolerate copying if their deque is to be expanded. */
@@ -66,8 +64,9 @@
 
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdlib.h>
 
-#include <libpspp/assertion.h>
+#include "libpspp/assertion.h"
 
 /* A deque implemented as a circular buffer. */
 struct deque