diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-07-20 04:12:25 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-07-20 04:12:25 +0400 |
| commit | f658e220d9c603d6b33c282382e459f2f4f0be45 (patch) | |
| tree | b0a9c9757636aaa7e90f9ea1f038e64570c94ae5 /winsup/w32api/include/winbase.h | |
| parent | 44480f46ead8ede722e737248c6d126a54da459f (diff) | |
2002-07-20 Casper S. Hornstrup <chorns@users.sourceforge.net>
* include/winbase.h (GetEnvironmentStringsA): Remove duplicate
definition.
(Interlocked*): Wrap in #ifndef __INTERLOCKED_DECLARED to
avoid compile error when already defined.
2002-07-20 Steven Edwards <Steven_Ed4153@yahoo.com>
* include/winuser.h (WM_MENURBUTTONUP): Add define.
Diffstat (limited to 'winsup/w32api/include/winbase.h')
| -rw-r--r-- | winsup/w32api/include/winbase.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index 0d30ebd71..3ed41abb5 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1305,6 +1305,8 @@ DWORD WINAPI SetCriticalSectionSpinCount(LPCRITICAL_SECTION,DWORD); #endif BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD); BOOL WINAPI InitializeSid (PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); +#ifndef __INTERLOCKED_DECLARED +#define __INTERLOCKED_DECLARED LONG WINAPI InterlockedCompareExchange(LPLONG,LONG,LONG); /* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */ #define InterlockedCompareExchangePointer(d,e,c) \ @@ -1316,6 +1318,7 @@ LONG WINAPI InterlockedExchange(LPLONG,LONG); (PVOID)InterlockedExchange((LPLONG)(t),(LONG)(v)) LONG WINAPI InterlockedExchangeAdd(LPLONG,LONG); LONG WINAPI InterlockedIncrement(LPLONG); +#endif /* __INTERLOCKED_DECLARED */ BOOL WINAPI IsBadCodePtr(FARPROC); BOOL WINAPI IsBadHugeReadPtr(PCVOID,UINT); BOOL WINAPI IsBadHugeWritePtr(PVOID,UINT); @@ -1771,7 +1774,6 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO; #define GetDiskFreeSpace GetDiskFreeSpaceA #define GetDiskFreeSpaceEx GetDiskFreeSpaceExA #define GetDriveType GetDriveTypeA -#define GetEnvironmentStringsA GetEnvironmentStrings #define GetEnvironmentVariable GetEnvironmentVariableA #define GetFileAttributes GetFileAttributesA #define GetFileSecurity GetFileSecurityA |