From 72124328cabddb3b3362cdb1ce61b0f9a65db85b Mon Sep 17 00:00:00 2001 From: dannysmith Date: Sat, 25 Jan 2003 00:41:45 +0000 Subject: [PATCH] * include/ras.h (RASCONN[AW]): Guard szDeviceType, szDeviceName fields with WINVER >= 0x400. Add dwFlags, luid fields for WINVER >= 0x501. --- winsup/w32api/ChangeLog | 6 ++++++ winsup/w32api/include/ras.h | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 142083d08f..c946a7f969 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2003-01-24 Danny Smith + + * include/ras.h (RASCONN[AW]): Guard szDeviceType, + szDeviceName fields with (WINVER >= 0x400). Add dwFlags, luid + fields for (WINVER >= 0x501). + 2003-01-23 Danny Smith * lib/ws2_32.def (getaddrinfo, freeaddrinfo and getnameinfo): diff --git a/winsup/w32api/include/ras.h b/winsup/w32api/include/ras.h index 43bbc25e05..db7c3c3db2 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 { -- 2.11.0