From: Dirk Lemstra Date: Sat, 1 Apr 2017 17:28:04 +0000 (+0200) Subject: Added windows implementation of getpagesize. X-Git-Tag: 7.0.5-5~72 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7e144819e02aa141500a40b8d729a2d2165e822;p=imagemagick Added windows implementation of getpagesize. --- diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h index df401fe91..04d173484 100644 --- a/MagickCore/nt-base-private.h +++ b/MagickCore/nt-base-private.h @@ -135,6 +135,7 @@ extern MagickPrivate int NTSystemCommand(const char *,char *); extern MagickPrivate ssize_t + NTGetPageSize(void), NTSystemConfiguration(int), NTTellDirectory(DIR *); diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c index e81bd1c62..48eaad98b 100644 --- a/MagickCore/nt-base.c +++ b/MagickCore/nt-base.c @@ -1025,6 +1025,33 @@ MagickPrivate MagickBooleanType NTGetModulePath(const char *module,char *path) % % % % % % ++ N T G e t P a g e S i z e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% NTGetPageSize() returns the page size under Windows. +% +% The format of the NTPageSize +% +% NTPageSize() +% +*/ +MagickPrivate ssize_t NTGetPageSize(void) +{ + SYSTEM_INFO + system_info; + + GetSystemInfo(&system_info); + return((ssize_t) system_info.dwPageSize); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % % N T G h o s t s c r i p t D L L % % % % % diff --git a/MagickCore/utility.c b/MagickCore/utility.c index 7543865ec..6554c739c 100644 --- a/MagickCore/utility.c +++ b/MagickCore/utility.c @@ -1113,10 +1113,10 @@ MagickPrivate ssize_t GetMagickPageSize(void) return(page_size); #if defined(MAGICKCORE_HAVE_SYSCONF) && defined(_SC_PAGE_SIZE) page_size=(ssize_t) sysconf(_SC_PAGE_SIZE); -#else -#if defined(MAGICKCORE_HAVE_GETPAGESIZE) +#elif defined(MAGICKCORE_HAVE_GETPAGESIZE) page_size=(ssize_t) getpagesize(); -#endif +#elif defined(MAGICKCORE_WINDOWS_SUPPORT) + page_size=NTGetPageSize(); #endif if (page_size <= 0) page_size=16384;