| odbcss.h (6.1.7600.16385-Windows_7.0) | | odbcss.h (6.3.9600.17415-Windows_8.1) |
|---|
|
| | /******************************************************** |
| | * * |
| | * Copyright (C) Microsoft. All rights reserved. * |
| | * * |
| | ********************************************************/ |
| | |
| //----------------------------------------------------------------------------- | | //----------------------------------------------------------------------------- |
| // File: odbcss.h | | // File: odbcss.h |
| // | | // |
|
| // Copyright: Copyright (c) Microsoft Corporation | | |
| // | | |
| // Contents: | | // Contents: |
| // | | // |
| // Comments: This is the application include file for the SQL Server driver sp
ecific defines. | | // Comments: This is the application include file for the SQL Server driver sp
ecific defines. |
| // | | // |
| //----------------------------------------------------------------------------- | | //----------------------------------------------------------------------------- |
| | |
| #ifndef __ODBCSS | | #ifndef __ODBCSS |
| #define __ODBCSS | | #define __ODBCSS |
|
| | #include <winapifamily.h> |
| | |
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" { /* Assume C declarations for C++ */ | | extern "C" { /* Assume C declarations for C++ */ |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ |
| | |
| // Useful defines | | // Useful defines |
| #define SQL_MAX_SQLSERVERNAME 128 // max SQL Server identifier leng
th | | #define SQL_MAX_SQLSERVERNAME 128 // max SQL Server identifier leng
th |
| | |
| // SQLSetConnectOption/SQLSetStmtOption driver specific defines. | | // SQLSetConnectOption/SQLSetStmtOption driver specific defines. |
| // Microsoft has 1200 thru 1249 reserved for Microsoft SQL Server driver usa
ge. | | // Microsoft has 1200 thru 1249 reserved for Microsoft SQL Server driver usa
ge. |
| | |
| skipping to change at line 647 | | skipping to change at line 655 |
|---|
| #define dbprtype dbprtypeA | | #define dbprtype dbprtypeA |
| #define BCPHINTS BCPHINTSA | | #define BCPHINTS BCPHINTSA |
| #endif | | #endif |
| | |
| // SQL Server catalog extensions for distributed queries | | // SQL Server catalog extensions for distributed queries |
| SQLRETURN SQL_API SQLLinkedServers (SQLHSTMT); | | SQLRETURN SQL_API SQLLinkedServers (SQLHSTMT); |
| SQLRETURN SQL_API SQLLinkedCatalogsA (SQLHSTMT, LPCSTR, SWORD); | | SQLRETURN SQL_API SQLLinkedCatalogsA (SQLHSTMT, LPCSTR, SWORD); |
| SQLRETURN SQL_API SQLLinkedCatalogsW (SQLHSTMT, LPCWSTR, SWORD); | | SQLRETURN SQL_API SQLLinkedCatalogsW (SQLHSTMT, LPCWSTR, SWORD); |
| | |
| // SQL Server extensions for server enumeration | | // SQL Server extensions for server enumeration |
|
| HANDLE SQL_API SQLInitEnumServers(__in LPWSTR pwchServerName, __in LPWSTR pwch
InstanceName); | | HANDLE SQL_API SQLInitEnumServers(_In_ LPWSTR pwchServerName, _In_ LPWSTR pwch
InstanceName); |
| RETCODE SQL_API SQLGetNextEnumeration (HANDLE hEnumHandle,BYTE * prgEnumData,IN
T * piEnumLength); | | RETCODE SQL_API SQLGetNextEnumeration (HANDLE hEnumHandle,BYTE * prgEnumData,IN
T * piEnumLength); |
| RETCODE SQL_API SQLCloseEnumServers (HANDLE hEnumHandle); | | RETCODE SQL_API SQLCloseEnumServers (HANDLE hEnumHandle); |
| | |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define SQLLinkedCatalogs SQLLinkedCatalogsW | | #define SQLLinkedCatalogs SQLLinkedCatalogsW |
| #else | | #else |
| #define SQLLinkedCatalogs SQLLinkedCatalogsA | | #define SQLLinkedCatalogs SQLLinkedCatalogsA |
| #endif | | #endif |
| | |
| // BCP column format properties | | // BCP column format properties |
| | |
| skipping to change at line 691 | | skipping to change at line 699 |
|---|
| #define SQL_INTEGRATED_SECURITY SQL_COPT_SS_INTEGRATED_SECURITY | | #define SQL_INTEGRATED_SECURITY SQL_COPT_SS_INTEGRATED_SECURITY |
| #define SQL_PRESERVE_CURSORS SQL_COPT_SS_PRESERVE_CURSORS | | #define SQL_PRESERVE_CURSORS SQL_COPT_SS_PRESERVE_CURSORS |
| #define SQL_TEXTPTR_LOGGING SQL_SOPT_SS_TEXTPTR_LOGGING | | #define SQL_TEXTPTR_LOGGING SQL_SOPT_SS_TEXTPTR_LOGGING |
| #define SQL_CA_SS_BASE_COLUMN_NAME SQL_DESC_BASE_COLUMN_NAME | | #define SQL_CA_SS_BASE_COLUMN_NAME SQL_DESC_BASE_COLUMN_NAME |
| #define SQLDECIMALN 0x6a | | #define SQLDECIMALN 0x6a |
| #define SQLNUMERICN 0x6c | | #define SQLNUMERICN 0x6c |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } /* End o
f extern "C" { */ | | } /* End o
f extern "C" { */ |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ |
|
| | |
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| #endif | | #endif |
| | |
| // End of odbcss.h | | // End of odbcss.h |
| | |
| End of changes. 5 change blocks. |
|---|
| 3 lines changed or deleted | | 15 lines changed or added |
|---|
|