Module: wine Branch: master Commit: 61768c0775c0a5feed3c54bc75d9034e085d5b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61768c0775c0a5feed3c54bc75...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jan 8 22:06:25 2013 +0100
configure: Get rid of the check for getpagesize.
---
configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 6 +----- libs/port/Makefile.in | 1 - libs/port/getpagesize.c | 39 --------------------------------------- 6 files changed, 1 insertions(+), 50 deletions(-)
diff --git a/configure b/configure index 6dc5b50..be9e7df 100755 --- a/configure +++ b/configure @@ -12963,7 +12963,6 @@ for ac_func in \ getattrlist \ getdirentries \ getopt_long_only \ - getpagesize \ getpwuid \ gettimeofday \ getuid \ diff --git a/configure.ac b/configure.ac index 4b0c360..d5b2a41 100644 --- a/configure.ac +++ b/configure.ac @@ -1999,7 +1999,6 @@ AC_CHECK_FUNCS(\ getattrlist \ getdirentries \ getopt_long_only \ - getpagesize \ getpwuid \ gettimeofday \ getuid \ diff --git a/include/config.h.in b/include/config.h.in index 9dc3e14..b8acb15 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -212,9 +212,6 @@ /* Define to 1 if you have the `getopt_long_only' function. */ #undef HAVE_GETOPT_LONG_ONLY
-/* Define to 1 if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE - /* Define to 1 if you have the `getprotobyname' function. */ #undef HAVE_GETPROTOBYNAME
diff --git a/include/wine/port.h b/include/wine/port.h index 9a9bb88..1bcc0e5 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -44,6 +44,7 @@ # include <process.h> #endif #include <string.h> +#include <stdlib.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -257,10 +258,6 @@ extern int getopt_long_only (int ___argc, char *const *___argv, int ffs( int x ); #endif
-#ifndef HAVE_GETPAGESIZE -size_t getpagesize(void); -#endif /* HAVE_GETPAGESIZE */ - #ifndef HAVE_ISINF int isinf(double x); #endif @@ -453,7 +450,6 @@ extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, #define fstatvfs __WINE_NOT_PORTABLE(fstatvfs) #define getopt_long __WINE_NOT_PORTABLE(getopt_long) #define getopt_long_only __WINE_NOT_PORTABLE(getopt_long_only) -#define getpagesize __WINE_NOT_PORTABLE(getpagesize) #define interlocked_cmpxchg __WINE_NOT_PORTABLE(interlocked_cmpxchg) #define interlocked_cmpxchg_ptr __WINE_NOT_PORTABLE(interlocked_cmpxchg_ptr) #define interlocked_xchg __WINE_NOT_PORTABLE(interlocked_xchg) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 71074b2..79bd1fe 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -7,7 +7,6 @@ C_SRCS = \ fstatvfs.c \ getopt.c \ getopt1.c \ - getpagesize.c \ interlocked.c \ isinf.c \ isnan.c \ diff --git a/libs/port/getpagesize.c b/libs/port/getpagesize.c deleted file mode 100644 index 0271e5d..0000000 --- a/libs/port/getpagesize.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * getpagesize function - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -#ifndef HAVE_GETPAGESIZE -size_t getpagesize(void) -{ -# ifdef __svr4__ - return sysconf(_SC_PAGESIZE); -# elif defined(__i386__) || defined(__x86_64__) - return 4096; -# else -# error Cannot get the page size on this platform -# endif -} -#endif /* HAVE_GETPAGESIZE */