From a0b703c900d1c5379d8ad64d33011f827ed2da59 Mon Sep 17 00:00:00 2001 From: khan Date: Thu, 30 Mar 2000 06:08:58 +0000 Subject: [PATCH] 2000-03-30 Mumit Khan * include/ole.h: Workaround for C++ parser bug. * include/rpcdcep.h: Likewise. * include/winsock.h: Likewise. --- winsup/w32api/ChangeLog | 6 ++++++ winsup/w32api/include/ole.h | 2 +- winsup/w32api/include/rpcdcep.h | 2 +- winsup/w32api/include/winsock.h | 14 +++++++------- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 1249423d6b..30039abca0 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2000-03-30 Mumit Khan + + * include/ole.h: Workaround for C++ parser bug. + * include/rpcdcep.h: Likewise. + * include/winsock.h: Likewise. + Sun Mar 26 13:41:47 2000 Christopher Faylor * include/winnt.h: Eliminate duplicate PCONTEXT and LPCONTEXT typedefs. diff --git a/winsup/w32api/include/ole.h b/winsup/w32api/include/ole.h index 1aa3f02459..f967459328 100644 --- a/winsup/w32api/include/ole.h +++ b/winsup/w32api/include/ole.h @@ -252,7 +252,7 @@ OLESTATUS WINAPI OleUpdate(LPOLEOBJECT); OLESTATUS WINAPI OleReconnect(LPOLEOBJECT); OLESTATUS WINAPI OleGetLinkUpdateOptions(LPOLEOBJECT,OLEOPT_UPDATE*); OLESTATUS WINAPI OleSetLinkUpdateOptions(LPOLEOBJECT,OLEOPT_UPDATE); -void *WINAPI OleQueryProtocol(LPOLEOBJECT,LPCSTR); +WINAPI void *OleQueryProtocol(LPOLEOBJECT,LPCSTR); OLESTATUS WINAPI OleQueryReleaseStatus(LPOLEOBJECT); OLESTATUS WINAPI OleQueryReleaseError(LPOLEOBJECT); OLE_RELEASE_METHOD WINAPI OleQueryReleaseMethod(LPOLEOBJECT); diff --git a/winsup/w32api/include/rpcdcep.h b/winsup/w32api/include/rpcdcep.h index 82d731ebd8..8479360a94 100644 --- a/winsup/w32api/include/rpcdcep.h +++ b/winsup/w32api/include/rpcdcep.h @@ -81,7 +81,7 @@ long __stdcall I_RpcFreeBuffer(RPC_MESSAGE*); void __stdcall I_RpcRequestMutex(I_RPC_MUTEX*); void __stdcall I_RpcClearMutex(I_RPC_MUTEX); void __stdcall I_RpcDeleteMutex(I_RPC_MUTEX); -void* __stdcall I_RpcAllocate(unsigned int); +__stdcall void *I_RpcAllocate(unsigned int); void __stdcall I_RpcFree(void*); void __stdcall I_RpcPauseExecution(unsigned long); typedef void(__stdcall *PRPC_RUNDOWN) (void*); diff --git a/winsup/w32api/include/winsock.h b/winsup/w32api/include/winsock.h index e4891b5f1a..885354aa29 100644 --- a/winsup/w32api/include/winsock.h +++ b/winsup/w32api/include/winsock.h @@ -430,7 +430,7 @@ int PASCAL getpeername(SOCKET,struct sockaddr*,int*); int PASCAL getsockname(SOCKET,struct sockaddr*,int*); int PASCAL getsockopt(SOCKET,int,int,char*,int*); unsigned long PASCAL inet_addr(const char*); -char * PASCAL inet_ntoa(struct in_addr); +PASCAL char *inet_ntoa(struct in_addr); int PASCAL listen(SOCKET,int); int PASCAL recv(SOCKET,char*,int,int); int PASCAL recvfrom(SOCKET,char*,int,int,struct sockaddr*,int*); @@ -439,12 +439,12 @@ int PASCAL sendto(SOCKET,const char*,int,int,const struct sockaddr*,int); int PASCAL setsockopt(SOCKET,int,int,const char*,int); int PASCAL shutdown(SOCKET,int); SOCKET PASCAL socket(int,int,int); -struct hostent* PASCAL gethostbyaddr(const char*,int,int); -struct hostent* PASCAL gethostbyname(const char*); -struct servent* PASCAL getservbyport(int,const char*); -struct servent* PASCAL getservbyname(const char*,const char*); -struct protoent* PASCAL getprotobynumber(int); -struct protoent* PASCAL getprotobyname(const char*); +PASCAL struct hostent *gethostbyaddr(const char*,int,int); +PASCAL struct hostent *gethostbyname(const char*); +PASCAL struct servent *getservbyport(int,const char*); +PASCAL struct servent *getservbyname(const char*,const char*); +PASCAL struct protoent *getprotobynumber(int); +PASCAL struct protoent *getprotobyname(const char*); int PASCAL WSAStartup(WORD,LPWSADATA); int PASCAL WSACleanup(void); void PASCAL WSASetLastError(int); -- 2.11.0