Skip to content

Commit 5f05941

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into 20190501_OCCI
2 parents 100ba80 + b7d36cb commit 5f05941

105 files changed

Lines changed: 526 additions & 519 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/connect/toc.yml

Lines changed: 364 additions & 364 deletions
Large diffs are not rendered by default.

docs/odbc/odbcconf-exe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ODBCCONF.exe is a command-line tool that allows you to configure ODBC drivers an
2222
2323
## Syntax
2424

25-
```
25+
```console
2626
ODBCCONF [switches] action
2727
```
2828

docs/odbc/reference/embedded-sql-example.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ manager: craigg
1919
# Embedded SQL Example
2020
The following code is a simple embedded SQL program, written in C. The program illustrates many, but not all, of the embedded SQL techniques. The program prompts the user for an order number, retrieves the customer number, salesperson, and status of the order, and displays the retrieved information on the screen.
2121

22-
```
22+
```cpp
2323
int main() {
2424
EXEC SQL INCLUDE SQLCA;
2525
EXEC SQL BEGIN DECLARE SECTION;

docs/odbc/reference/odbc-64-bit-information.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Beginning with Windows Server 2003, Microsoft operating systems have supported t
2828
## Function Declaration Changes
2929
The following function signatures have changed for 64-bit programming. The items in bold text are the specific parameters that are different.
3030

31-
```c
31+
```cpp
3232
SQLBindCol (SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber,
3333
SQLSMALLINT TargetType, SQLPOINTER TargetValuePtr, SQLLEN BufferLength, SQLLEN * StrLen_or_Ind);
3434

@@ -120,7 +120,7 @@ typedef SQLLEN SQLROWOFFSET;
120120

121121
The definition of SQLSETPOSIROW has changed for both 32-bit and 64-bit compilers:
122122

123-
```c
123+
```cpp
124124
#ifdef _WIN64
125125
typedef UINT64 SQLSETPOSIROW;
126126
#else
@@ -130,7 +130,7 @@ typedef UINT64 SQLSETPOSIROW;
130130

131131
The definitions of SQLLEN and SQLULEN have changed for 64-bit compilers:
132132

133-
```c
133+
```cpp
134134
#ifdef _WIN64
135135
typedef INT64 SQLLEN;
136136
typedef UINT64 SQLULEN;
@@ -142,7 +142,7 @@ typedef UINT64 SQLULEN;
142142

143143
Although SQL_C_BOOKMARK is deprecated in ODBC 3.0, for 64-bit compilers on 2.0 clients, this value has changed:
144144

145-
```c
145+
```cpp
146146
#ifdef _WIN64
147147
#define SQL_C_BOOKMARK SQL_C_UBIGINT
148148
#else
@@ -152,7 +152,7 @@ typedef UINT64 SQLULEN;
152152

153153
The BOOKMARK type is defined differently in the newer headers:
154154

155-
```c
155+
```cpp
156156
typedef SQLULEN BOOKMARK;
157157
```
158158

docs/odbc/reference/syntax/configdriver-function.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ manager: craigg
3030

3131
## Syntax
3232

33-
```
33+
```cpp
3434

3535
BOOL ConfigDriver(
3636
HWND hwndParent,

docs/odbc/reference/syntax/configdsn-function.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ manager: craigg
3030

3131
## Syntax
3232

33-
```
33+
```cpp
3434

3535
BOOL ConfigDSN(
3636
HWND hwndParent,

docs/odbc/reference/syntax/configtranslator-function.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ manager: craigg
3030

3131
## Syntax
3232

33-
```
33+
```cpp
3434

3535
BOOL ConfigTranslator(
3636
HWND hwndParent,

docs/odbc/reference/syntax/installation-and-configuration-wwi-oltp.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ manager: craigg
2323

2424
## Syntax
2525

26-
```
26+
```cpp
27+
2728
SQLRETURN SQLSetDriverConnectInfo(
2829
SQLHDBC_INFO_TOKEN hDbcInfoToken,
2930
WCHAR * InConnectionString,

docs/odbc/reference/syntax/sqlallochandle-function.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ manager: craigg
3333
3434
## Syntax
3535

36-
```
36+
```cpp
3737

3838
SQLRETURN SQLAllocHandle(
3939
SQLSMALLINT HandleType,

docs/odbc/reference/syntax/sqlbindcol-function.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ manager: craigg
3030

3131
## Syntax
3232

33-
```
33+
```cpp
3434

3535
SQLRETURN SQLBindCol(
3636
SQLHSTMT StatementHandle,
@@ -279,7 +279,7 @@ SQLRETURN SQLBindCol(
279279
280280
For more code examples, see [SQLBulkOperations Function](../../../odbc/reference/syntax/sqlbulkoperations-function.md), [SQLColumns Function](../../../odbc/reference/syntax/sqlcolumns-function.md), [SQLFetchScroll Function](../../../odbc/reference/syntax/sqlfetchscroll-function.md), and [SQLSetPos Function](../../../odbc/reference/syntax/sqlsetpos-function.md).
281281
282-
```
282+
```cpp
283283
// SQLBindCol_ref.cpp
284284
// compile with: odbc32.lib
285285
#include <windows.h>

0 commit comments

Comments
 (0)