Francois Gouget : include: Move some definitions from iptypes.h to nldef.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 58fdd9ac1d51e3e3090168eee2a768690a37e557
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=58fdd9ac1d51e3e3090168eee2...

Author: Francois Gouget 
Date:   Tue Dec 13 21:04:31 2011 +0100

include: Move some definitions from iptypes.h to nldef.h.

Include nldef.h where appropriate.

---

include/Makefile.in |    1 +
 include/iptypes.h   |   30 ++++--------------------------
 include/mstcpip.h   |    2 ++
 include/nldef.h     |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/include/Makefile.in b/include/Makefile.in
index bea68f0..6bd9020 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -406,6 +406,7 @@ SRCDIR_INCLUDES = \
    msxmldid.h \
    nb30.h \
    ndrtypes.h \
+	nldef.h \
    npapi.h \
    nspapi.h \
    ntddcdrm.h \
diff --git a/include/iptypes.h b/include/iptypes.h
index 8ce7df6..997388e 100644
--- a/include/iptypes.h
+++ b/include/iptypes.h
@@ -21,6 +21,7 @@

#include <time.h>
 #include <ifdef.h>
+#include <nldef.h>

#define MAX_ADAPTER_DESCRIPTION_LENGTH  128
 #define MAX_ADAPTER_NAME_LENGTH         256
@@ -87,32 +88,9 @@ typedef struct {
     UINT EnableDns;
 } FIXED_INFO, *PFIXED_INFO;

-typedef enum {
-    IpPrefixOriginOther = 0,
-    IpPrefixOriginManual,
-    IpPrefixOriginWellKnown,
-    IpPrefixOriginDhcp,
-    IpPrefixOriginRouterAdvertisement,
-    IpPrefixOriginUnchanged = 16
-} IP_PREFIX_ORIGIN;
-
-typedef enum {
-    IpSuffixOriginOther = 0,
-    IpSuffixOriginManual,
-    IpSuffixOriginWellKnown,
-    IpSuffixOriginDhcp,
-    IpSuffixOriginLinkLayerAddress,
-    IpSuffixOriginRandom,
-    IpSuffixOriginUnchanged = 16
-} IP_SUFFIX_ORIGIN;
-
-typedef enum {
-    IpDadStateInvalid = 0,
-    IpDadStateTentative,
-    IpDadStateDuplicate,
-    IpDadStateDeprecated,
-    IpDadStatePreferred
-} IP_DAD_STATE;
+typedef NL_PREFIX_ORIGIN IP_PREFIX_ORIGIN;
+typedef NL_SUFFIX_ORIGIN IP_SUFFIX_ORIGIN;
+typedef NL_DAD_STATE IP_DAD_STATE;

#ifdef _WINSOCK2API_

diff --git a/include/mstcpip.h b/include/mstcpip.h
index 147e135..cb3ce8d 100644
--- a/include/mstcpip.h
+++ b/include/mstcpip.h
@@ -18,6 +18,8 @@
 #ifndef __WINE_MSTCPIP_H
 #define __WINE_MSTCPIP_H

+#include <nldef.h>
+
 struct tcp_keepalive
 {
     ULONG onoff;
diff --git a/include/nldef.h b/include/nldef.h
new file mode 100644
index 0000000..abce1af
--- /dev/null
+++ b/include/nldef.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2003 Juan Lang
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+#ifndef __WINE_NLDEF_H
+#define __WINE_NLDEF_H
+
+typedef enum
+{
+    IpPrefixOriginOther = 0,
+    IpPrefixOriginManual,
+    IpPrefixOriginWellKnown,
+    IpPrefixOriginDhcp,
+    IpPrefixOriginRouterAdvertisement,
+    IpPrefixOriginUnchanged = 16,
+} NL_PREFIX_ORIGIN;
+
+typedef enum
+{
+    IpSuffixOriginOther = 0,
+    IpSuffixOriginManual,
+    IpSuffixOriginWellKnown,
+    IpSuffixOriginDhcp,
+    IpSuffixOriginLinkLayerAddress,
+    IpSuffixOriginRandom,
+    IpSuffixOriginUnchanged = 16,
+} NL_SUFFIX_ORIGIN;
+
+typedef enum
+{
+    IpDadStateInvalid = 0,
+    IpDadStateTentative,
+    IpDadStateDuplicate,
+    IpDadStateDeprecated,
+    IpDadStatePreferred,
+} NL_DAD_STATE;
+
+#endif /* __WINE_NLDEF_H */