diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-10-20 08:52:46 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-10-21 08:43:44 +0200 |
| commit | 5a0498ded11d514c21e3124333a3560da1373202 (patch) | |
| tree | c71443d5bc6bd89be82225561bb476a5a27ae2d5 /external | |
| parent | d5fa192f54eeb4294748d262034f64556fabd4fb (diff) | |
mariadb connector: upgrade to release 3.3.7 (fixes tdf#157826)
Change-Id: I053b827b7bc14535760236fcb057c154c359f4dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158252
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk | 8 | ||||
| -rw-r--r-- | external/mariadb-connector-c/configs/wnt_ma_config.h | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk index 3458089ce99e..b8802e16695e 100644 --- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk @@ -21,12 +21,10 @@ $(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\ # This is needed for MSVC 2008: it somehow finds a dlopen somewhere # but the static library then contains unreferenced symbols. # This macro enables a re-definition to native Win32 APIs in my_global.h. -## TODO missing enable: -D HAVE_COMPRESS -## (but then need to add "-lz" to mysqlcppconn linking) -$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1)) +$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -DHAVE_COMPRESS -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1)) ifeq ($(OS),WNT) -$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED -DHAVE_STRTOULL)) +$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED -DHAVE_STRTOULL -DHAVE_WINCRYPT)) $(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\ $$(INCLUDE) \ -I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/win-iconv \ @@ -46,7 +44,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\ UnpackedTarball/mariadb-connector-c/libmariadb/ma_default \ UnpackedTarball/mariadb-connector-c/libmariadb/ma_dtoa \ UnpackedTarball/mariadb-connector-c/libmariadb/ma_errmsg \ - UnpackedTarball/mariadb-connector-c/libmariadb/ma_hash \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_hashtbl \ UnpackedTarball/mariadb-connector-c/libmariadb/ma_init \ UnpackedTarball/mariadb-connector-c/libmariadb/ma_io \ UnpackedTarball/mariadb-connector-c/libmariadb/ma_list \ diff --git a/external/mariadb-connector-c/configs/wnt_ma_config.h b/external/mariadb-connector-c/configs/wnt_ma_config.h index d06393509881..acd08c125a95 100644 --- a/external/mariadb-connector-c/configs/wnt_ma_config.h +++ b/external/mariadb-connector-c/configs/wnt_ma_config.h @@ -72,11 +72,7 @@ # define HAVE_LONG 1 #endif -#ifdef _M_X64 #define SIZEOF_LONG_LONG 8 -#else -#define SIZEOF_LONG_LONG 4 -#endif #if defined(SIZEOF_LONG_LONG) # define HAVE_LONG_LONG 1 #endif |