summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2003-01-25 00:41:45 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2003-01-25 00:41:45 +0000
commitbb9f07bc54aef09e646d86146f9308e12138ccb2 (patch)
tree79fffbdb77ce0c347f88011ecd0573747b9ed97f
parent3b64773bfc0a947fc2d3b04914aea0af1fcd4bd5 (diff)
downloadcygnal-bb9f07bc54aef09e646d86146f9308e12138ccb2.tar.gz
cygnal-bb9f07bc54aef09e646d86146f9308e12138ccb2.tar.bz2
cygnal-bb9f07bc54aef09e646d86146f9308e12138ccb2.zip
* include/ras.h (RASCONN[AW]): Guard szDeviceType,
szDeviceName fields with WINVER >= 0x400. Add dwFlags, luid fields for WINVER >= 0x501.
-rw-r--r--winsup/w32api/ChangeLog6
-rw-r--r--winsup/w32api/include/ras.h12
2 files changed, 18 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 142083d08..c946a7f96 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-24 Danny Smith <dannysmith@users.sourceforge.net>
+
+ * include/ras.h (RASCONN[AW]): Guard szDeviceType,
+ szDeviceName fields with (WINVER >= 0x400). Add dwFlags, luid
+ fields for (WINVER >= 0x501).
+
2003-01-23 Danny Smith <dannysmith@users.sourceforge.net>
* lib/ws2_32.def (getaddrinfo, freeaddrinfo and getnameinfo):
diff --git a/winsup/w32api/include/ras.h b/winsup/w32api/include/ras.h
index 43bbc25e0..db7c3c3db 100644
--- a/winsup/w32api/include/ras.h
+++ b/winsup/w32api/include/ras.h
@@ -222,8 +222,10 @@ typedef struct tagRASCONNW {
DWORD dwSize;
HRASCONN hrasconn;
WCHAR szEntryName[RAS_MaxEntryName + 1];
+#if (WINVER >= 0x400)
WCHAR szDeviceType[RAS_MaxDeviceType + 1];
WCHAR szDeviceName[RAS_MaxDeviceName + 1];
+#endif
#if (WINVER >= 0x401)
WCHAR szPhonebook[MAX_PATH];
DWORD dwSubEntry;
@@ -231,14 +233,20 @@ typedef struct tagRASCONNW {
#if (WINVER >= 0x500)
GUID guidEntry;
#endif
+#if (WINVER >= 0x501)
+ DWORD dwFlags;
+ LUID luid;
+#endif
} RASCONNW, *LPRASCONNW;
typedef struct tagRASCONNA {
DWORD dwSize;
HRASCONN hrasconn;
CHAR szEntryName[RAS_MaxEntryName + 1];
+#if (WINVER >= 0x400)
CHAR szDeviceType[RAS_MaxDeviceType + 1];
CHAR szDeviceName[RAS_MaxDeviceName + 1];
+#endif
#if (WINVER >= 0x401)
CHAR szPhonebook[MAX_PATH];
DWORD dwSubEntry;
@@ -246,6 +254,10 @@ typedef struct tagRASCONNA {
#if (WINVER >= 0x500)
GUID guidEntry;
#endif
+#if (WINVER >= 0x501)
+ DWORD dwFlags;
+ LUID luid;
+#endif
} RASCONNA, *LPRASCONNA;
typedef struct tagRASCONNSTATUSW {