database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-31 10:30:33 +03:00
Code Activity

Back out old unixodbc patches and apply new ones. Nick Gorham

Browse Source
This commit is contained in:
Bruce Momjian
2000-06-12 17:58:20 +00:00
parent b0929c82ac
commit b45ea42234
4 changed files with 148 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/interfaces/odbc/GNUmakefile.in
View File

@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.13 2000/06/06 22:01:09 petere Exp $
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.14 2000/06/12 17:58:20 momjian Exp $
#
#-------------------------------------------------------------------------
@SET_MAKE@
@@ -38,12 +38,11 @@ OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
SHLIB_LINK= $(LD_FLAGS)
SHLIB_LINK+= $(SHLIB_ODBC)
# Shared library stuff, also default 'all' target
include $(SRCDIR)/Makefile.shlib
LDFLAGS_SL+= $(LDFLAGS_ODBC)
.PHONY: install install-ini beforeinstall-headers install-headers
install: $(HEADERDIR) $(LIBDIR) $(ODBCINST) install-headers \

2
src/interfaces/odbc/dlg_specific.c
View File

@@ -23,7 +23,7 @@
#ifndef WIN32
#include <string.h>
#include "gpps.h"
#ifndef HAVE_SQLGETPRIVATEPROFILESTRING
#ifdef HAVE_SQLGETPRIVATEPROFILESTRING
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
#define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d)
#endif

3
src/interfaces/odbc/misc.h
View File

@@ -15,7 +15,8 @@
#endif
#ifndef WIN32
#ifndef HAVE_SQLGETPRIVATEPROFILESTRING
#include "gpps.h"
#ifdef HAVE_SQLGETPRIVATEPROFILESTRING
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
#endif
#endif