misc changes

[bpt/emacs.git] / src / getpagesize.h

diff --git a/src/getpagesize.h b/src/getpagesize.h
index ab54062..496bf21 100644 (file)
--- a/src/getpagesize.h
+++ b/src/getpagesize.h
@@ -1,13 +1,13 @@
 /* Emulate getpagesize on systems that lack it.
-   Copyright (C) 1986, 1992, 1995, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1992, 1995, 2001-2014 Free Software Foundation,
+   Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs 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, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,22 +15,14 @@ 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 GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef HAVE_GETPAGESIZE
 
-# ifdef VMS
-#  define getpagesize() 512
-# endif
-
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
+# include <unistd.h>
 
 # ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
+#  define getpagesize() sysconf (_SC_PAGESIZE)
 # else /* no _SC_PAGESIZE */
 #  ifdef HAVE_SYS_PARAM_H
 #   include <sys/param.h>
@@ -55,5 +47,3 @@ Boston, MA 02110-1301, USA.  */
 
 #endif /* no HAVE_GETPAGESIZE */
 
-/* arch-tag: ff6206e3-97e2-4763-923a-e84bf28eabbc
-   (do not change this comment) */