Module: wine Branch: master Commit: accb42f3c3dc107e79381678078f6a9a1d82210f URL: http://source.winehq.org/git/wine.git/?a=commit;h=accb42f3c3dc107e7938167807...
Author: Juan Lang juan.lang@gmail.com Date: Tue Sep 14 12:57:31 2010 -0700
include: Move IF_OPER_STATUS to ifdef.h.
---
include/ifdef.h | 10 ++++++++++ include/iptypes.h | 11 +---------- 2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/include/ifdef.h b/include/ifdef.h index a3f2b01..0b52d80 100644 --- a/include/ifdef.h +++ b/include/ifdef.h @@ -179,4 +179,14 @@ typedef enum _IF_ADMINISTRATIVE_STATE { IF_ADMINISTRATIVE_STATE_DEMANDDIAL = 2 } IF_ADMINISTRATIVE_STATE, *PIF_ADMINISTRATIVE_STATE;
+typedef enum { + IfOperStatusUp = 1, + IfOperStatusDown, + IfOperStatusTesting, + IfOperStatusUnknown, + IfOperStatusDormant, + IfOperStatusNotPresent, + IfOperStatusLowerLayerDown +} IF_OPER_STATUS; + #endif /* WINE_IFDEF_H*/ diff --git a/include/iptypes.h b/include/iptypes.h index 9b80f77..82927a9 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -20,6 +20,7 @@ #define WINE_IPTYPES_H_
#include <time.h> +#include <ifdef.h>
#define MAX_ADAPTER_DESCRIPTION_LENGTH 128 #define MAX_ADAPTER_NAME_LENGTH 256 @@ -104,16 +105,6 @@ typedef enum { } IP_SUFFIX_ORIGIN;
typedef enum { - IfOperStatusUp = 1, - IfOperStatusDown, - IfOperStatusTesting, - IfOperStatusUnknown, - IfOperStatusDormant, - IfOperStatusNotPresent, - IfOperStatusLowerLayerDown -} IF_OPER_STATUS; - -typedef enum { IpDadStateInvalid = 0, IpDadStateTentative, IpDadStateDuplicate,