mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1) Fix compile errors on Windows.

Browse Source 
2) Change *Common* --> *Default*.
This commit is contained in:
Hiroshi Inoue 2001-09-24 00:05:59 +00:00
parent c0a9283742
commit 2df4087a70
6 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/interfaces/odbc/convert.c
View File

@ -1013,7 +1013,8 @@ copy_statement_with_parameters(StatementClass *stmt)
stmt->options.scroll_concurrency = SQL_CONCUR_READ_ONLY; stmt->options.scroll_concurrency = SQL_CONCUR_READ_ONLY;
else if (!stmt->ti || stmt->ntab != 1) else if (!stmt->ti || stmt->ntab != 1)
stmt->options.scroll_concurrency = SQL_CONCUR_READ_ONLY; stmt->options.scroll_concurrency = SQL_CONCUR_READ_ONLY;
else search_from_pos = TRUE; else
search_from_pos = TRUE;
} }
#endif /* DRIVER_CURSOR_IMPLEMENT */ #endif /* DRIVER_CURSOR_IMPLEMENT */

3
src/interfaces/odbc/environ.c
View File

@ -514,6 +514,9 @@ EN_Destructor(EnvironmentClass *self)
free(self); free(self);
mylog("exit EN_Destructor: rv = %d\n", rv); mylog("exit EN_Destructor: rv = %d\n", rv);
#ifdef _MEMORY_DEBUG_
debug_memory_inouecheck();
#endif /* _MEMORY_DEBUG_ */
return rv; return rv;
} }

5
src/interfaces/odbc/odbcapi.c
View File

@ -26,11 +26,10 @@
*------- *-------
*/ */
#include "psqlodbc.h"
#ifdef WIN32 #ifdef WIN32
#undef ODBCVER #define ODBCVER_REP 0x3000
#define ODBCVER 0x3000
#endif #endif
#include "psqlodbc.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

3
src/interfaces/odbc/odbcapi30.c
View File

@ -18,9 +18,8 @@
*------- *-------
*/ */
#define ODBCVER_REP 0x0300
#include "psqlodbc.h" #include "psqlodbc.h"
#undef ODBCVER
#define ODBCVER 0x0300
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

17
src/interfaces/odbc/psqlodbc.h
View File

@ -5,7 +5,7 @@
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
* $Id: psqlodbc.h,v 1.49 2001/09/22 22:54:33 petere Exp $ * $Id: psqlodbc.h,v 1.50 2001/09/24 00:05:59 inoue Exp $
* *
*/ */
@ -21,7 +21,11 @@
#include <stdio.h> /* for FILE* pointers: see GLOBAL_VALUES */ #include <stdio.h> /* for FILE* pointers: see GLOBAL_VALUES */
/* Must come before sql.h */ /* Must come before sql.h */
#ifdef ODBCVER_REP
#define ODBCVER ODBCVER_REP
#else
#define ODBCVER 0x0250 #define ODBCVER 0x0250
#endif /* ODBCVER_REP */
#if defined(WIN32) || defined(WITH_UNIXODBC) || defined(WITH_IODBC) #if defined(WIN32) || defined(WITH_UNIXODBC) || defined(WITH_IODBC)
@ -232,4 +236,15 @@ queries used in info.c inoue 2001/05/17 */
#include "misc.h" #include "misc.h"
#ifdef _MEMORY_DEBUG_
void * debug_alloc(size_t);
void * debug_realloc(void *, size_t);
char * debug_strdup(const char *);
void debug_free(void *);
void debug_memory_check(void);
#define malloc debug_alloc
#define realloc debug_realloc
#define strdup debug_strdup
#define free debug_free
#endif /* _MEMORY_DEBUG_ */
#endif #endif

4
src/interfaces/odbc/psqlodbc.rc
View File

@ -134,7 +134,7 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,59,201,50,14,WS_GROUP DEFPUSHBUTTON "OK",IDOK,59,201,50,14,WS_GROUP
PUSHBUTTON "Cancel",IDCANCEL,124,201,50,14 PUSHBUTTON "Cancel",IDCANCEL,124,201,50,14
PUSHBUTTON "Defaults",IDDEFAULTS,189,201,50,15 PUSHBUTTON "Defaults",IDDEFAULTS,189,201,50,15
CONTROL "Common",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | CONTROL "Default",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
BS_NOTIFY | WS_TABSTOP,233,208,40,10 BS_NOTIFY | WS_TABSTOP,233,208,40,10
END END
@ -251,7 +251,7 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,45,220,50,14,WS_GROUP DEFPUSHBUTTON "OK",IDOK,45,220,50,14,WS_GROUP
PUSHBUTTON "Cancel",IDCANCEL,110,220,50,14 PUSHBUTTON "Cancel",IDCANCEL,110,220,50,14
PUSHBUTTON "Defaults",IDDEFAULTS,175,220,50,15 PUSHBUTTON "Defaults",IDDEFAULTS,175,220,50,15
CONTROL "Common",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | CONTROL "Default",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
BS_NOTIFY | WS_TABSTOP,233,224,40,10 BS_NOTIFY | WS_TABSTOP,233,224,40,10
END END