diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-10-11 22:43:54 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-10-11 22:43:54 +0400 |
| commit | 677f3499b3530260200c8b367f36e63128a621bf (patch) | |
| tree | d3e600159086a469d4a2e798a792fcd236c6dfae | |
| parent | daed3bec547e6e3bf9bc8586d4f2526b8ee7861b (diff) | |
Add ChangeLog: * include/winbase.h (GetProcessId): Declare.
Revert erroneous include/winsock.h checkin.
| -rw-r--r-- | winsup/w32api/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/w32api/include/winbase.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/winsock.h | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 0b8c57113..6058a603a 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,7 @@ +2005-10-11 Christopher Faylor <cgf@timesys.com> + + * include/winbase.h (GetProcessId): Declare. + 2005-09-23 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> * lib/ddk/newdev.def: Added. diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index 7db8db547..b4473244a 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1350,7 +1350,9 @@ WINBASEAPI HANDLE WINAPI GetCurrentProcess(void); WINBASEAPI DWORD WINAPI GetCurrentProcessId(void); WINBASEAPI HANDLE WINAPI GetCurrentThread(void); WINBASEAPI DWORD WINAPI GetCurrentThreadId(void); +#if (_WIN32_WINNT >= 0x0501) WINBASEAPI DWORD WINAPI GetProcessId(HANDLE); +#endif #define GetCurrentTime GetTickCount WINBASEAPI BOOL WINAPI GetDefaultCommConfigA(LPCSTR,LPCOMMCONFIG,PDWORD); WINBASEAPI BOOL WINAPI GetDefaultCommConfigW(LPCWSTR,LPCOMMCONFIG,PDWORD); diff --git a/winsup/w32api/include/winsock.h b/winsup/w32api/include/winsock.h index 7c3375f93..d99d84cbc 100644 --- a/winsup/w32api/include/winsock.h +++ b/winsup/w32api/include/winsock.h @@ -351,8 +351,8 @@ struct sockproto { #define PF_INET6 AF_INET6 #define PF_MAX AF_MAX #define SOL_SOCKET 0xffff -#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) #define SOMAXCONN 5 +#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) #define MSG_OOB 1 #define MSG_PEEK 2 #define MSG_DONTROUTE 4 |