Francois Gouget : include: Add the missing inaddr.h and in6addr. h include directives.
Alexandre Julliard
julliard at winehq.org
Fri Dec 9 14:41:38 CST 2011
Module: wine
Branch: master
Commit: 653c1d76d063d48decba2592c7187d0c58d343fa
URL: http://source.winehq.org/git/wine.git/?a=commit;h=653c1d76d063d48decba2592c7187d0c58d343fa
Author: Francois Gouget <fgouget at free.fr>
Date: Fri Dec 9 12:00:39 2011 +0100
include: Add the missing inaddr.h and in6addr.h include directives.
---
dlls/iphlpapi/icmp.c | 2 ++
dlls/iphlpapi/ifenum.h | 2 +-
include/ipexport.h | 3 +++
include/mprapi.h | 2 +-
include/ras.h | 2 ++
include/ws2def.h | 2 +-
6 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c
index 78b91c6..fb87fe2 100644
--- a/dlls/iphlpapi/icmp.c
+++ b/dlls/iphlpapi/icmp.c
@@ -63,6 +63,8 @@
# include <sys/poll.h>
#endif
+#define USE_WS_PREFIX
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h
index 1a55376..228d7ee 100644
--- a/dlls/iphlpapi/ifenum.h
+++ b/dlls/iphlpapi/ifenum.h
@@ -37,8 +37,8 @@
#include "windef.h"
#include "winbase.h"
-#include "iprtrmib.h"
#define USE_WS_PREFIX
+#include "iprtrmib.h"
#include "winsock2.h"
#define MAX_INTERFACE_PHYSADDR 8
diff --git a/include/ipexport.h b/include/ipexport.h
index 71a44ba..a0e30ba 100644
--- a/include/ipexport.h
+++ b/include/ipexport.h
@@ -21,6 +21,9 @@
#ifndef __WINE_IPEXPORT_H
#define __WINE_IPEXPORT_H
+#include <in6addr.h>
+#include <inaddr.h>
+
typedef ULONG IPAddr;
typedef ULONG IPMask;
typedef ULONG IP_STATUS;
diff --git a/include/mprapi.h b/include/mprapi.h
index 2eec3b9..1860f98 100644
--- a/include/mprapi.h
+++ b/include/mprapi.h
@@ -21,7 +21,7 @@
#include <lmcons.h>
#include <ras.h>
-/* FIXME: #include <in6addr.h> */
+#include <in6addr.h>
#define MAX_DEVICE_NAME 128
#define MAX_DEVICETYPE_NAME 16
diff --git a/include/ras.h b/include/ras.h
index 3a75f41..f9fad2e 100644
--- a/include/ras.h
+++ b/include/ras.h
@@ -25,6 +25,8 @@
extern "C" {
#endif
#include <pshpack4.h>
+#include <inaddr.h>
+#include <in6addr.h>
#define RAS_MaxCallbackNumber RAS_MaxPhoneNumber
#define RAS_MaxDeviceName 128
diff --git a/include/ws2def.h b/include/ws2def.h
index 8c1fc4a..ac68e2b 100644
--- a/include/ws2def.h
+++ b/include/ws2def.h
@@ -19,7 +19,7 @@
#ifndef _WS2DEF_
#define _WS2DEF_
-/* FIXME: #include <inaddr.h> */
+#include <inaddr.h>
#ifdef USE_WS_PREFIX
#define WS(x) WS_##x
More information about the wine-cvs
mailing list