* include/sys/cygwin.h (cygwin_getinfo_types): Define values

	additionally as preprocessor symbols.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index dfa8dc309f03630f4d00e0f7e5f49f6d9323b39f..82de82a6e115b35c239a87e814dce61ecfae5b1f 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-07  Corinna Vinschen  <corinna@vinschen.de>
+
+       * include/sys/cygwin.h (cygwin_getinfo_types): Define values
+       additionally as preprocessor symbols.
+
 2011-10-06  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler_termios.cc (fhandler_termios::tcsetpgrp): Send __SIGSETPGRP

diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h
index 74286183614e0572b9d4485e475f52ee7db5a230..5fe3af7947e2946643495eacb57c4063e270912a 100644 (file)
--- a/winsup/cygwin/include/sys/cygwin.h
+++ b/winsup/cygwin/include/sys/cygwin.h
@@ -1,7 +1,7 @@
 /* sys/cygwin.h
 
    Copyright 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010 Red Hat, Inc.
+   2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -138,11 +138,57 @@ typedef enum
     CW_CVT_ENV_TO_WINENV
   } cygwin_getinfo_types;
 
+#define CW_LOCK_PINFO CW_LOCK_PINFO
+#define CW_UNLOCK_PINFO CW_UNLOCK_PINFO
+#define CW_GETTHREADNAME CW_GETTHREADNAME
+#define CW_GETPINFO CW_GETPINFO
+#define CW_SETPINFO CW_SETPINFO
+#define CW_SETTHREADNAME CW_SETTHREADNAME
+#define CW_GETVERSIONINFO CW_GETVERSIONINFO
+#define CW_READ_V1_MOUNT_TABLES CW_READ_V1_MOUNT_TABLES
+#define CW_USER_DATA CW_USER_DATA
+#define CW_PERFILE CW_PERFILE
+#define CW_GET_CYGDRIVE_PREFIXES CW_GET_CYGDRIVE_PREFIXES
+#define CW_GETPINFO_FULL CW_GETPINFO_FULL
+#define CW_INIT_EXCEPTIONS CW_INIT_EXCEPTIONS
+#define CW_GET_CYGDRIVE_INFO CW_GET_CYGDRIVE_INFO
+#define CW_SET_CYGWIN_REGISTRY_NAME CW_SET_CYGWIN_REGISTRY_NAME
+#define CW_GET_CYGWIN_REGISTRY_NAME CW_GET_CYGWIN_REGISTRY_NAME
+#define CW_STRACE_TOGGLE CW_STRACE_TOGGLE
+#define CW_STRACE_ACTIVE CW_STRACE_ACTIVE
+#define CW_CYGWIN_PID_TO_WINPID CW_CYGWIN_PID_TO_WINPID
+#define CW_EXTRACT_DOMAIN_AND_USER CW_EXTRACT_DOMAIN_AND_USER
+#define CW_CMDLINE CW_CMDLINE
+#define CW_CHECK_NTSEC CW_CHECK_NTSEC
+#define CW_GET_ERRNO_FROM_WINERROR CW_GET_ERRNO_FROM_WINERROR
+#define CW_GET_POSIX_SECURITY_ATTRIBUTE CW_GET_POSIX_SECURITY_ATTRIBUTE
+#define CW_GET_SHMLBA CW_GET_SHMLBA
+#define CW_GET_UID_FROM_SID CW_GET_UID_FROM_SID
+#define CW_GET_GID_FROM_SID CW_GET_GID_FROM_SID
+#define CW_GET_BINMODE CW_GET_BINMODE
+#define CW_HOOK CW_HOOK
+#define CW_ARGV CW_ARGV
+#define CW_ENVP CW_ENVP
+#define CW_DEBUG_SELF CW_DEBUG_SELF
+#define CW_SYNC_WINENV CW_SYNC_WINENV
+#define CW_CYGTLS_PADSIZE CW_CYGTLS_PADSIZE
+#define CW_SET_DOS_FILE_WARNING CW_SET_DOS_FILE_WARNING
+#define CW_SET_PRIV_KEY CW_SET_PRIV_KEY
+#define CW_SETERRNO CW_SETERRNO
+#define CW_EXIT_PROCESS CW_EXIT_PROCESS
+#define CW_SET_EXTERNAL_TOKEN CW_SET_EXTERNAL_TOKEN
+#define CW_GET_INSTKEY CW_GET_INSTKEY
+#define CW_INT_SETLOCALE CW_INT_SETLOCALE
+#define CW_CVT_MNT_OPTS CW_CVT_MNT_OPTS
+#define CW_LST_MNT_OPTS CW_LST_MNT_OPTS
+#define CW_STRERROR CW_STRERROR
+#define CW_CVT_ENV_TO_WINENV CW_CVT_ENV_TO_WINENV
+
 /* Token type for CW_SET_EXTERNAL_TOKEN */
 enum
 {
-  CW_TOKEN_IMPERSONATION = 0,
-  CW_TOKEN_RESTRICTED    = 1
+CW_TOKEN_IMPERSONATION = 0,
+CW_TOKEN_RESTRICTED    = 1
 };
 
 #define CW_NEXTPID     0x80000000      /* or with pid to get next one */