Backport from mainline

[pf3gnuchains/gcc-fork.git] / libiberty / getpagesize.c

diff --git a/libiberty/getpagesize.c b/libiberty/getpagesize.c
index e9784b8..1c3a263 100644 (file)
--- a/libiberty/getpagesize.c
+++ b/libiberty/getpagesize.c
@@ -2,20 +2,14 @@
 
 /*
 
-NAME
+@deftypefn Supplemental int getpagesize (void)
 
-       getpagesize -- return the number of bytes in page of memory
+Returns the number of bytes in a page of memory.  This is the
+granularity of many of the system memory management routines.  No
+guarantee is made as to whether or not it is the same as the basic
+memory management hardware page size.
 
-SYNOPSIS
-
-       int getpagesize (void)
-
-DESCRIPTION
-
-       Returns the number of bytes in a page of memory.  This is the
-       granularity of many of the system memory management routines.
-       No guarantee is made as to whether or not it is the same as the
-       basic memory management hardware page size.
+@end deftypefn
 
 BUGS
 
@@ -28,39 +22,46 @@ BUGS
 
 #ifndef VMS
 
+#include "config.h"
+
 #include <sys/types.h>
-#ifndef NO_SYS_PARAM_H
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 
-#ifdef HAVE_SYSCONF
+#undef GNU_OUR_PAGESIZE
+#if defined (HAVE_SYSCONF) && defined (HAVE_UNISTD_H)
 #include <unistd.h>
+#ifdef _SC_PAGESIZE
 #define GNU_OUR_PAGESIZE sysconf(_SC_PAGESIZE)
-#else
-#ifdef PAGESIZE
-#define        GNU_OUR_PAGESIZE PAGESIZE
-#else  /* no PAGESIZE */
-#ifdef EXEC_PAGESIZE
-#define        GNU_OUR_PAGESIZE EXEC_PAGESIZE
-#else  /* no EXEC_PAGESIZE */
-#ifdef NBPG
-#define        GNU_OUR_PAGESIZE (NBPG * CLSIZE)
-#ifndef        CLSIZE
-#define        CLSIZE 1
-#endif /* CLSIZE */
-#else  /* no NBPG */
-#ifdef NBPC
-#define        GNU_OUR_PAGESIZE NBPC
-#else  /* no NBPC */
-#define        GNU_OUR_PAGESIZE 4096   /* Just punt and use reasonable value */
-#endif /* NBPC */
-#endif /* NBPG */
-#endif /* EXEC_PAGESIZE */
-#endif /* PAGESIZE */
-#endif /* HAVE_SYSCONF */
+#endif
+#endif
+
+#ifndef GNU_OUR_PAGESIZE
+# ifdef        PAGESIZE
+#  define      GNU_OUR_PAGESIZE PAGESIZE
+# else /* no PAGESIZE */
+#  ifdef       EXEC_PAGESIZE
+#   define     GNU_OUR_PAGESIZE EXEC_PAGESIZE
+#  else        /* no EXEC_PAGESIZE */
+#   ifdef      NBPG
+#    define    GNU_OUR_PAGESIZE (NBPG * CLSIZE)
+#    ifndef    CLSIZE
+#     define   CLSIZE 1
+#    endif     /* CLSIZE */
+#   else       /* no NBPG */
+#    ifdef     NBPC
+#     define   GNU_OUR_PAGESIZE NBPC
+#    else      /* no NBPC */
+#     define   GNU_OUR_PAGESIZE 4096   /* Just punt and use reasonable value */
+#    endif /* NBPC */
+#   endif /* NBPG */
+#  endif /* EXEC_PAGESIZE */
+# endif /* PAGESIZE */
+#endif /* GNU_OUR_PAGESIZE */
 
 int
-getpagesize ()
+getpagesize (void)
 {
   return (GNU_OUR_PAGESIZE);
 }
@@ -75,7 +76,7 @@ getpagesize ()
 #endif
 extern unsigned long lib$getsyi(const unsigned short *,...);
 
-int getpagesize ()
+int getpagesize (void)
 {
   long pagsiz = 0L;
   unsigned short itmcod = SYI$_PAGE_SIZE;