Skip to content

Commit af70014

Browse files
author
Hiroshi Inoue
committed
Fix a complie error on Windows platform.
1 parent 34fd508 commit af70014

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

src/interfaces/odbc/convert.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
*/
1818
/* Multibyte support Eiji Tokuya 2001-03-15 */
1919

20-
#include "convert.h"
21-
2220
#include <stdio.h>
2321
#include <string.h>
2422
#include <ctype.h>
@@ -37,6 +35,7 @@
3735
#include <sqlext.h>
3836
#endif
3937

38+
#include "convert.h"
4039
#include <time.h>
4140
#include <math.h>
4241
#include <stdlib.h>
@@ -939,7 +938,7 @@ into_table_from(const char *stmt)
939938
/*
940939
* This function inserts parameters into an SQL statements.
941940
* It will also modify a SELECT statement for use with declare/fetch cursors.
942-
* This function does a dynamic memory allocation to get rid of query siz elimit!
941+
* This function does a dynamic memory allocation to get rid of query size limit!
943942
*/
944943
int
945944
copy_statement_with_parameters(StatementClass *stmt)
@@ -961,8 +960,7 @@ copy_statement_with_parameters(StatementClass *stmt)
961960
time_t t = time(NULL);
962961
struct tm *tim;
963962
SDWORD used;
964-
char *buffer,
965-
*buf;
963+
char *buffer, *buf;
966964
BOOL in_quote = FALSE, in_dquote = FALSE, in_escape = FALSE;
967965
Oid lobj_oid;
968966
int lobj_fd,

src/interfaces/odbc/convert.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111

1212
#include "psqlodbc.h"
1313

14-
#include "isql.h"
15-
1614
/* copy_and_convert results */
17-
#define COPY_OK 0
15+
#define COPY_OK 0
1816
#define COPY_UNSUPPORTED_TYPE 1
1917
#define COPY_UNSUPPORTED_CONVERSION 2
2018
#define COPY_RESULT_TRUNCATED 3

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy