* external.cc (fillout_pinfo): Use new version define.

	* include/sys/cygwin.h (external_pinfo): Define
	EXTERNAL_PINFO_VERSION_16_BIT and EXTERNAL_PINFO_VERSION_32_BIT
	instead of just EXTERNAL_PINFO_VERSION.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f55aecb..3971dba 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-29  Corinna Vinschen  <corinna@vinschen.de>
+
+       * external.cc (fillout_pinfo): Use new version define.
+       * include/sys/cygwin.h (external_pinfo): Define
+       EXTERNAL_PINFO_VERSION_16_BIT and EXTERNAL_PINFO_VERSION_32_BIT
+       instead of just EXTERNAL_PINFO_VERSION.
+
 2002-05-29  Christopher Faylor  <cgf@redhat.com>
 
        * external.cc (fillout_pinfo): Set new version field in external_pinfo

diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc
index 00ab2ac..24b8338 100644 (file)
--- a/winsup/cygwin/external.cc
+++ b/winsup/cygwin/external.cc
@@ -83,7 +83,7 @@ fillout_pinfo (pid_t pid, int winpid)
          ep.rusage_children = p->rusage_children;
          strcpy (ep.progname, p->progname);
          ep.strace_mask = 0;
-         ep.version = EXTERNAL_PINFO_VERSION;
+         ep.version = EXTERNAL_PINFO_VERSION_32_BIT;
 
          ep.process_state = p->process_state;
 

diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h
index 1e4a094..938d098 100644 (file)
--- a/winsup/cygwin/include/sys/cygwin.h
+++ b/winsup/cygwin/include/sys/cygwin.h
@@ -208,7 +208,8 @@ extern int cygwin_attach_handle_to_fd (char *, int, HANDLE, mode_t, DWORD);
 
 #define TTY_CONSOLE    0x40000000
 
-#define EXTERNAL_PINFO_VERSION 1
+#define EXTERNAL_PINFO_VERSION_16_BIT 0
+#define EXTERNAL_PINFO_VERSION_32_BIT 1
 
 #ifndef _SYS_TYPES_H
 typedef unsigned short __uid16_t;
@@ -241,6 +242,7 @@ struct external_pinfo
 
   DWORD process_state;
 
+  /* Only available if version >= EXTERNAL_PINFO_VERSION_32_BIT */
   __uid32_t uid32;
   __gid32_t gid32;
 };