| nspapi.h (6.3.9600.17415-Windows 8.1) | | nspapi.h (10.0.10586.0-Windows 10 1511 10586.494) |
| | |
| skipping to change at line 32 | | skipping to change at line 32 |
| use definitions from base files rather than redefine here. | | use definitions from base files rather than redefine here. |
| Unfortunately, so such base file exists. | | Unfortunately, so such base file exists. |
| | |
| --*/ | | --*/ |
| | |
| #ifndef _NSPAPI_INCLUDED | | #ifndef _NSPAPI_INCLUDED |
| #define _NSPAPI_INCLUDED | | #define _NSPAPI_INCLUDED |
| | |
| #include <winapifamily.h> | | #include <winapifamily.h> |
| | |
|
| #pragma region Desktop Family | | #pragma region Desktop Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" { | | extern "C" { |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ |
| | |
| #ifndef _tagBLOB_DEFINED | | #ifndef _tagBLOB_DEFINED |
| #define _tagBLOB_DEFINED | | #define _tagBLOB_DEFINED |
| #define _BLOB_DEFINED | | #define _BLOB_DEFINED |
| #define _LPBLOB_DEFINED | | #define _LPBLOB_DEFINED |
| typedef struct _BLOB { | | typedef struct _BLOB { |
| | |
| skipping to change at line 687 | | skipping to change at line 687 |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define GetService GetServiceW | | #define GetService GetServiceW |
| #else | | #else |
| #define GetService GetServiceA | | #define GetService GetServiceA |
| #endif // !UNICODE | | #endif // !UNICODE |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY
STEM) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif // _NSPAPI_INCLUDED | | #endif // _NSPAPI_INCLUDED |
| | |
| End of changes. 2 change blocks. |
| 3 lines changed or deleted | | 3 lines changed or added |
|
| winsock.h (6.3.9600.17415-Windows 8.1) | | winsock.h (10.0.10586.0-Windows 10 1511 10586.494) |
| | |
| skipping to change at line 32 | | skipping to change at line 32 |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| /* | | /* |
| * Pull in WINDOWS.H if necessary | | * Pull in WINDOWS.H if necessary |
| */ | | */ |
| #ifndef _INC_WINDOWS | | #ifndef _INC_WINDOWS |
| #include <windows.h> | | #include <windows.h> |
| #endif /* _INC_WINDOWS */ | | #endif /* _INC_WINDOWS */ |
| | |
|
| | #if _MSC_VER >= 1200 |
| | #pragma warning(push) |
| | #pragma warning(disable:4820) // padding added after data member |
| | #endif |
| | |
| /* | | /* |
| * Basic system type definitions, taken from the BSD file sys/types.h. | | * Basic system type definitions, taken from the BSD file sys/types.h. |
| */ | | */ |
| typedef unsigned char u_char; | | typedef unsigned char u_char; |
| typedef unsigned short u_short; | | typedef unsigned short u_short; |
| typedef unsigned int u_int; | | typedef unsigned int u_int; |
| typedef unsigned long u_long; | | typedef unsigned long u_long; |
| | |
| /* | | /* |
| * The new type to be used in all | | * The new type to be used in all |
| | |
| skipping to change at line 1070 | | skipping to change at line 1075 |
| * to a WSAAsyncSelect(). | | * to a WSAAsyncSelect(). |
| */ | | */ |
| #define WSAGETSELECTERROR(lParam) HIWORD(lParam) | | #define WSAGETSELECTERROR(lParam) HIWORD(lParam) |
| | |
| #if(_WIN32_WINNT >= 0x0501) | | #if(_WIN32_WINNT >= 0x0501) |
| #ifdef IPV6STRICT | | #ifdef IPV6STRICT |
| #error WINSOCK2 required. | | #error WINSOCK2 required. |
| #endif // IPV6STRICT | | #endif // IPV6STRICT |
| #endif //(_WIN32_WINNT >= 0x0501) | | #endif //(_WIN32_WINNT >= 0x0501) |
| | |
|
| | #if _MSC_VER >= 1200 |
| | #pragma warning(pop) |
| | #endif |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif /* _WINSOCKAPI_ */ | | #endif /* _WINSOCKAPI_ */ |
| | |
| End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 9 lines changed or added |
|