Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2df4087

Browse files
author
Hiroshi Inoue
committed
1) Fix compile errors on Windows.
2) Change *Common* --> *Default*.
1 parentc0a9283 commit2df4087

File tree

6 files changed

+26
-9
lines changed

6 files changed

+26
-9
lines changed

‎src/interfaces/odbc/convert.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,8 @@ copy_statement_with_parameters(StatementClass *stmt)
10131013
stmt->options.scroll_concurrency=SQL_CONCUR_READ_ONLY;
10141014
elseif (!stmt->ti||stmt->ntab!=1)
10151015
stmt->options.scroll_concurrency=SQL_CONCUR_READ_ONLY;
1016-
elsesearch_from_pos= TRUE;
1016+
else
1017+
search_from_pos= TRUE;
10171018
}
10181019
#endif/* DRIVER_CURSOR_IMPLEMENT */
10191020

‎src/interfaces/odbc/environ.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,9 @@ EN_Destructor(EnvironmentClass *self)
514514
free(self);
515515

516516
mylog("exit EN_Destructor: rv = %d\n",rv);
517+
#ifdef_MEMORY_DEBUG_
518+
debug_memory_inouecheck();
519+
#endif/* _MEMORY_DEBUG_ */
517520
returnrv;
518521
}
519522

‎src/interfaces/odbc/odbcapi.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626
*-------
2727
*/
2828

29-
#include"psqlodbc.h"
3029
#ifdefWIN32
31-
#undefODBCVER
32-
#defineODBCVER0x3000
30+
#defineODBCVER_REP0x3000
3331
#endif
32+
#include"psqlodbc.h"
3433
#include<stdio.h>
3534
#include<string.h>
3635

‎src/interfaces/odbc/odbcapi30.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
*-------
1919
*/
2020

21+
#defineODBCVER_REP 0x0300
2122
#include"psqlodbc.h"
22-
#undef ODBCVER
23-
#defineODBCVER 0x0300
2423
#include<stdio.h>
2524
#include<string.h>
2625

‎src/interfaces/odbc/psqlodbc.h

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Comments:See "notice.txt" for copyright and license information.
77
*
8-
* $Id: psqlodbc.h,v 1.49 2001/09/22 22:54:33 petere Exp $
8+
* $Id: psqlodbc.h,v 1.50 2001/09/24 00:05:59 inoue Exp $
99
*
1010
*/
1111

@@ -21,7 +21,11 @@
2121
#include<stdio.h>/* for FILE* pointers: see GLOBAL_VALUES */
2222

2323
/* Must come before sql.h */
24+
#ifdefODBCVER_REP
25+
#defineODBCVERODBCVER_REP
26+
#else
2427
#defineODBCVER0x0250
28+
#endif/* ODBCVER_REP */
2529

2630

2731
#if defined(WIN32)|| defined(WITH_UNIXODBC)|| defined(WITH_IODBC)
@@ -232,4 +236,15 @@ queries used in info.c inoue 2001/05/17 */
232236

233237
#include"misc.h"
234238

239+
#ifdef_MEMORY_DEBUG_
240+
void*debug_alloc(size_t);
241+
void*debug_realloc(void*,size_t);
242+
char*debug_strdup(constchar*);
243+
voiddebug_free(void*);
244+
voiddebug_memory_check(void);
245+
#definemallocdebug_alloc
246+
#definereallocdebug_realloc
247+
#definestrdupdebug_strdup
248+
#definefreedebug_free
249+
#endif/* _MEMORY_DEBUG_ */
235250
#endif

‎src/interfaces/odbc/psqlodbc.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ BEGIN
134134
DEFPUSHBUTTON "OK",IDOK,59,201,50,14,WS_GROUP
135135
PUSHBUTTON "Cancel",IDCANCEL,124,201,50,14
136136
PUSHBUTTON "Defaults",IDDEFAULTS,189,201,50,15
137-
CONTROL "Common",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
137+
CONTROL "Default",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
138138
BS_NOTIFY | WS_TABSTOP,233,208,40,10
139139
END
140140

@@ -251,7 +251,7 @@ BEGIN
251251
DEFPUSHBUTTON "OK",IDOK,45,220,50,14,WS_GROUP
252252
PUSHBUTTON "Cancel",IDCANCEL,110,220,50,14
253253
PUSHBUTTON "Defaults",IDDEFAULTS,175,220,50,15
254-
CONTROL "Common",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
254+
CONTROL "Default",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
255255
BS_NOTIFY | WS_TABSTOP,233,224,40,10
256256
END
257257

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp