[Libreoffice-commits] .: dbaccess/source
David Tardon
dtardon at kemper.freedesktop.org
Tue Jan 25 22:49:16 PST 2011
dbaccess/source/ui/dlg/odbcconfig.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 22f6062545c9dbe8bba96cf22482869dc85cfa5b
Author: David Tardon <dtardon at redhat.com>
Date: Wed Jan 26 07:49:00 2011 +0100
fix build with system ODBC
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index 7f6860c..b4115ca 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -36,7 +36,11 @@
// with the solar.h stuff (which itself already clashes with <windows.h>).
#define ULONG ODBC_ULONG
+#ifdef SYSTEM_ODBC_HEADERS
+#include <sqltypes.h>
+#else
#include <odbc/sqltypes.h>
+#endif
#undef ULONG
#undef BOOL
More information about the Libreoffice-commits
mailing list