aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/odbc/GNUmakefile.in5
-rw-r--r--src/interfaces/odbc/dlg_specific.c2
-rw-r--r--src/interfaces/odbc/misc.h3
3 files changed, 5 insertions, 5 deletions
diff --git a/src/interfaces/odbc/GNUmakefile.in b/src/interfaces/odbc/GNUmakefile.in
index 819402c30ba..23a84c57672 100644
--- a/src/interfaces/odbc/GNUmakefile.in
+++ b/src/interfaces/odbc/GNUmakefile.in
@@ -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 \
diff --git a/src/interfaces/odbc/dlg_specific.c b/src/interfaces/odbc/dlg_specific.c
index ebe16c1c6e3..96a045e1751 100644
--- a/src/interfaces/odbc/dlg_specific.c
+++ b/src/interfaces/odbc/dlg_specific.c
@@ -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
diff --git a/src/interfaces/odbc/misc.h b/src/interfaces/odbc/misc.h
index 700e951e917..8d0ad630bdf 100644
--- a/src/interfaces/odbc/misc.h
+++ b/src/interfaces/odbc/misc.h
@@ -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