[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/lib ChangeLog getaddrinfo.c
From: |
Jim Hyslop |
Subject: |
[Cvs-cvs] ccvs/lib ChangeLog getaddrinfo.c |
Date: |
Thu, 06 Jul 2006 23:01:57 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Jim Hyslop <jhyslop> 06/07/06 23:01:57
Modified files:
lib : ChangeLog getaddrinfo.c
Log message:
* getaddrinfo.c:
- Fixed a second compile problem: moved WSAAPI macro
inside brackets.
- Minor changes to suppress some compiler warnings.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/ChangeLog?cvsroot=cvs&r1=1.531&r2=1.532
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getaddrinfo.c?cvsroot=cvs&r1=1.11&r2=1.12
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ChangeLog,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -b -r1.531 -r1.532
--- ChangeLog 6 Jul 2006 17:38:28 -0000 1.531
+++ ChangeLog 6 Jul 2006 23:01:57 -0000 1.532
@@ -3,6 +3,11 @@
* getaddrinfo.c: changed '#if WIN32_NATIVE' to '#ifdef' to allow it
to compile in MSVC
+ * getaddrinfo.c:
+ - Fixed a second compile problem: moved WSAAPI macro
+ inside brackets.
+ - Minor changes to suppress some compiler warnings.
+
2006-07-06 Derek Price <address@hidden>
* Makefile.am: Import changes from...
Index: getaddrinfo.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getaddrinfo.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- getaddrinfo.c 6 Jul 2006 17:38:28 -0000 1.11
+++ getaddrinfo.c 6 Jul 2006 23:01:57 -0000 1.12
@@ -47,11 +47,11 @@
#endif
#ifdef WIN32_NATIVE
-typedef int WSAAPI (*getaddrinfo_func) (const char*, const char*,
+typedef int (WSAAPI *getaddrinfo_func) (const char*, const char*,
const struct addrinfo*,
struct addrinfo**);
-typedef void WSAAPI (*freeaddrinfo_func) (struct addrinfo*);
-typedef int WSAAPI (*getnameinfo_func) (const struct sockaddr*,
+typedef void (WSAAPI *freeaddrinfo_func) (struct addrinfo*);
+typedef int (WSAAPI *getnameinfo_func) (const struct sockaddr*,
socklen_t, char*, DWORD,
char*, DWORD, int);
@@ -74,9 +74,9 @@
if (h)
{
- getaddrinfo_ptr = GetProcAddress (h, "getaddrinfo");
- freeaddrinfo_ptr = GetProcAddress (h, "freeaddrinfo");
- getnameinfo_ptr = GetProcAddress (h, "getnameinfo");
+ getaddrinfo_ptr = (getaddrinfo_func) GetProcAddress (h, "getaddrinfo");
+ freeaddrinfo_ptr = (freeaddrinfo_func) GetProcAddress (h,
"freeaddrinfo");
+ getnameinfo_ptr = (getnameinfo_func) GetProcAddress (h, "getnameinfo");
}
/* If either is missing, something is odd. */
@@ -296,7 +296,10 @@
{
#ifdef WIN32_NATIVE
if (use_win32_p ())
- return freeaddrinfo_ptr (ai);
+ {
+ freeaddrinfo_ptr (ai);
+ return;
+ }
#endif
while (ai)