Skip to content

Commit 075519a

Browse files
committed
Update to new ODBC types SQLLEN and SQLULEN to fix issue #5172
1 parent 6acfaf4 commit 075519a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

mapmssql2008.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ void setMSSQL2008LayerInfo(layerObj *layer, msMSSQL2008LayerInfo *MSSQL2008layer
420420
void handleSQLError(layerObj *layer)
421421
{
422422
SQLCHAR SqlState[6], Msg[SQL_MAX_MESSAGE_LENGTH];
423-
SQLINTEGER NativeError;
423+
SQLLEN NativeError;
424424
SQLSMALLINT i, MsgLen;
425425
SQLRETURN rc;
426426
msMSSQL2008LayerInfo *layerinfo = getMSSQL2008LayerInfo(layer);
@@ -609,7 +609,7 @@ static int columnName(msODBCconn *conn, int index, char *buffer, int bufferLengt
609609
SQLCHAR columnName[SQL_COLUMN_NAME_MAX_LENGTH + 1];
610610
SQLSMALLINT columnNameLen;
611611
SQLSMALLINT dataType;
612-
SQLUINTEGER columnSize;
612+
SQLULEN columnSize;
613613
SQLSMALLINT decimalDigits;
614614
SQLSMALLINT nullable;
615615

@@ -1578,8 +1578,8 @@ int msMSSQL2008LayerGetShapeRandom(layerObj *layer, shapeObj *shape, long *recor
15781578
{
15791579
msMSSQL2008LayerInfo *layerinfo;
15801580
int result;
1581-
SQLINTEGER needLen = 0;
1582-
SQLINTEGER retLen = 0;
1581+
SQLLEN needLen = 0;
1582+
SQLLEN retLen = 0;
15831583
char dummyBuffer[1];
15841584
char *wkbBuffer;
15851585
char *valueBuffer;
@@ -1606,7 +1606,7 @@ int msMSSQL2008LayerGetShapeRandom(layerObj *layer, shapeObj *shape, long *recor
16061606
shape->type = MS_SHAPE_NULL;
16071607

16081608
while(shape->type == MS_SHAPE_NULL) {
1609-
/* SQLRETURN rc = SQLFetchScroll(layerinfo->conn->hstmt, SQL_FETCH_ABSOLUTE, (SQLINTEGER) (*record) + 1); */
1609+
/* SQLRETURN rc = SQLFetchScroll(layerinfo->conn->hstmt, SQL_FETCH_ABSOLUTE, (SQLLEN) (*record) + 1); */
16101610

16111611
/* We only do forward fetches. the parameter 'record' is ignored, but is incremented */
16121612
SQLRETURN rc = SQLFetch(layerinfo->conn->hstmt);
@@ -2038,7 +2038,7 @@ int msMSSQL2008LayerRetrievePK(layerObj *layer, char **urid_name, char* table_na
20382038

20392039
{
20402040
char buff[100];
2041-
SQLINTEGER retLen;
2041+
SQLLEN retLen;
20422042
rc = SQLGetData(layerinfo->conn->hstmt, 1, SQL_C_BINARY, buff, sizeof(buff), &retLen);
20432043

20442044
rc = SQLFetch(layerinfo->conn->hstmt);

0 commit comments

Comments
 (0)