[Libreoffice-commits] core.git: connectivity/Library_odbc.mk

Lionel Elie Mamane lionel at mamane.lu
Thu Sep 18 21:18:05 PDT 2014


 connectivity/Library_odbc.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit beed6cb8add346c017de212c5ee18fa786caed8b
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Sep 19 06:17:29 2014 +0200

    oups... fudge to match system ABI when *not* using system ODBC headers
    
    Change-Id: Iacf99411c87947c47f1ecb1ff8236d6b533145bb

diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
index 9b8bce1..181114a 100644
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,odbc,\
 
 $(eval $(call gb_Library_add_defs,odbc,\
 	-DOOO_DLLIMPLEMENTATION_ODBCBASE \
-	$(if $(and $(filter MACOSX,$(OS)), $(filter TRUE,$(SYSTEM_ODBC_HEADERS))), \
+	$(if $(and $(filter MACOSX,$(OS)), $(if $(SYSTEM_ODBC_HEADERS),,TRUE)), \
 		-DSQL_WCHART_CONVERT) \
 ))
 


More information about the Libreoffice-commits mailing list