* include/sys/cygwin.h: Declare cygwin_internal as unsigned long.

* external.cc (cygwin_internal): Define as unsigned long.
* include/sys/cygwin.h: Move cygwin_internal outside of WINVER conditional.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 11cbe29..51fbf14 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-28  Christopher Faylor  <cgf@redhat.com>
+
+       * include/sys/cygwin.h: Declare cygwin_internal as unsigned long.
+       * external.cc (cygwin_internal): Define as unsigned long.
+
+2003-03-27  Christopher Faylor  <cgf@redhat.com>
+
+       * include/sys/cygwin.h: Move cygwin_internal outside of WINVER
+       conditional.
+
 2003-03-27  Thomas Pfaff  <tpfaff@gmx.net>
 
        * thread.cc: Change 1==foo equations to foo==1 throughout.

diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc
index 582bb2a..a7d364a 100644 (file)
--- a/winsup/cygwin/external.cc
+++ b/winsup/cygwin/external.cc
@@ -121,7 +121,7 @@ get_cygdrive_prefixes (char *user, char *system)
   return res;
 }
 
-extern "C" DWORD
+extern "C" unsigned long
 cygwin_internal (cygwin_getinfo_types t, ...)
 {
   va_list arg;

diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h
index cc5641c..5985db6 100644 (file)
--- a/winsup/cygwin/include/sys/cygwin.h
+++ b/winsup/cygwin/include/sys/cygwin.h
@@ -75,6 +75,7 @@ typedef enum
   } cygwin_getinfo_types;
 
 #define CW_NEXTPID     0x80000000      /* or with pid to get next one */
+unsigned long cygwin_internal (cygwin_getinfo_types, ...);
 
 /* Flags associated with process_state */
 enum
@@ -249,7 +250,6 @@ struct external_pinfo
   __gid32_t gid32;
 };
 
-DWORD cygwin_internal (cygwin_getinfo_types, ...);
 #endif /*WINVER*/
 
 #ifdef __cplusplus