diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-07-21 04:17:41 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-07-21 04:17:41 +0400 |
| commit | 9e35380b5a15fafc7c735330ba56c7841edc16e0 (patch) | |
| tree | e95bc5e55163921cff871ab8d480416597f9aa19 | |
| parent | 5ec1dcc5bfc1762b4dec338e4a259272658c3c74 (diff) | |
2002-07-21 Bart Oldeman <bart.oldeman@btinternet.com>
* include/shlobj.h (FCIDM_MENU_FAVORITES): Remove bogus
character.
* include/winsock2.h (struct sockaddr): Use __int64 instead of
long long.
* include/kernel32.c (GetCurrentFiber, GetFiberData): Watcom
does not need external library functions.
| -rw-r--r-- | winsup/w32api/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/w32api/include/shlobj.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/winsock2.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/lib/kernel32.c | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 20fa14a86..161ccba8d 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,12 @@ +2002-07-21 Bart Oldeman <bart.oldeman@btinternet.com> + + * include/shlobj.h (FCIDM_MENU_FAVORITES): Remove bogus + character. + * include/winsock2.h (struct sockaddr): Use __int64 instead of + long long. + * include/kernel32.c (GetCurrentFiber, GetFiberData): Watcom + does not need external *Fiber library functions. + 2002-07-20 Casper S. Hornstrup <chorns@users.sourceforge.net> * include/winbase.h (GetEnvironmentStringsA): Remove duplicate diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index 9a3d045e3..70264ab29 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -216,7 +216,7 @@ extern "C" { #define FCIDM_MENU_HELP (FCIDM_GLOBALFIRST+0x0100) #define FCIDM_MENU_FIND (FCIDM_GLOBALFIRST+0x0140) #define FCIDM_MENU_EXPLORE (FCIDM_GLOBALFIRST+0x0150) -#define FCIDM_MENU_FAVORITES (FCIDM_GLOBALFIRST+0x0170) +#define FCIDM_MENU_FAVORITES (FCIDM_GLOBALFIRST+0x0170) #define FCIDM_TOOLBAR FCIDM_BROWSERFIRST #define FCIDM_STATUS (FCIDM_BROWSERFIRST+1) #define SBSP_DEFBROWSER 0 diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h index cd1579aed..db5bae0d0 100644 --- a/winsup/w32api/include/winsock2.h +++ b/winsup/w32api/include/winsock2.h @@ -333,7 +333,7 @@ struct sockaddr { struct sockaddr_storage { short ss_family; char __ss_pad1[6]; /* pad to 8 */ - long long __ss_align; /* force alignment */ + __int64 __ss_align; /* force alignment */ char __ss_pad2[112]; /* pad to 128 */ }; diff --git a/winsup/w32api/lib/kernel32.c b/winsup/w32api/lib/kernel32.c index d66a5064b..53222588d 100644 --- a/winsup/w32api/lib/kernel32.c +++ b/winsup/w32api/lib/kernel32.c @@ -25,7 +25,7 @@ void* GetFiberData(void) return ret; } -#else +#elif !defined (__WATCOMC__) void* GetCurrentFiber(void) { |