diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index f236f117c..1eba5ce26 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 15 13:50:00 2001 Corinna Vinschen + + * heap.cc (heap_init): Fix extern declaration of getpagesize. + * syscalls.cc (getpagesize): Fix another typo. + Mon Jan 15 12:48:00 2001 Corinna Vinschen * syscalls.cc (getpagesize): Save pagesize in global variable to diff --git a/winsup/cygwin/heap.cc b/winsup/cygwin/heap.cc index d2934f2d6..0d27d77f8 100644 --- a/winsup/cygwin/heap.cc +++ b/winsup/cygwin/heap.cc @@ -21,6 +21,8 @@ details. */ static unsigned page_const = 0; +extern "C" size_t getpagesize (); + /* Initialize the heap at process start up. */ void @@ -29,7 +31,6 @@ heap_init () /* If we're the forkee, we must allocate the heap at exactly the same place as our parent. If not, we don't care where it ends up. */ - extern size_t getpagesize (); page_const = getpagesize (); if (brkbase) { diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index df5103809..71869cfc5 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1353,12 +1353,11 @@ getdtablesize () return fdtab.size; } -static DWORD sys_page_size = 0; - extern "C" size_t getpagesize () { - return sysconf (_SC_PAGESIZE); + static DWORD sys_page_size = 0; + if (!sys_page_size) { SYSTEM_INFO si;