fix: Fix symbol export visibility

meson.build

@@ -29,6 +29,14 @@ project(
  ]
 )
 
+if meson.get_compiler('c').get_id() == 'gcc' or meson.get_compiler('c').get_id() == 'clang'
+ add_project_arguments(['-fvisibility=hidden'], language: 'c')
+endif
+
+if meson.get_compiler('cpp').get_id() == 'gcc' or meson.get_compiler('cpp').get_id() == 'clang'
+ add_project_arguments(['-fvisibility=hidden'], language: 'cpp')
+endif
+
 subdir('src/nanoarrow')
 
 if get_option('benchmarks')

src/apps/dump_stream.c

@@ -122,7 +122,7 @@ int main(int argc, char* argv[]) {
 
  end = clock();
  elapsed = (end - begin) / ((double)CLOCKS_PER_SEC);
- fprintf(stdout, "Read %l" PRId64 " rows in %" PRId64 " batch(es) <%.06f seconds>\n",
+ fprintf(stdout, "Read %" PRId64 " rows in %" PRId64 " batch(es) <%.06f seconds>\n",
  row_count, batch_count, elapsed);
 
  ArrowArrayStreamRelease(&stream);

src/nanoarrow/integration/c_data_integration.cc

@@ -209,25 +209,25 @@ static const char* ConvertError(ArrowErrorCode errno_code) {
 
 int64_t nanoarrow_BytesAllocated() { return kBytesAllocated; }
 
-DLL_EXPORT const char* nanoarrow_CDataIntegration_ExportSchemaFromJson(
+NANOARROW_DLL_EXPORT const char* nanoarrow_CDataIntegration_ExportSchemaFromJson(
  const char* json_path, ArrowSchema* out) {
  ArrowErrorInit(&global_error);
  return ConvertError(ExportSchemaFromJson(json_path, out, &global_error));
 }
 
-DLL_EXPORT const char* nanoarrow_CDataIntegration_ImportSchemaAndCompareToJson(
+NANOARROW_DLL_EXPORT const char* nanoarrow_CDataIntegration_ImportSchemaAndCompareToJson(
  const char* json_path, ArrowSchema* schema) {
  ArrowErrorInit(&global_error);
  return ConvertError(ImportSchemaAndCompareToJson(json_path, schema, &global_error));
 }
 
-DLL_EXPORT const char* nanoarrow_CDataIntegration_ExportBatchFromJson(
+NANOARROW_DLL_EXPORT const char* nanoarrow_CDataIntegration_ExportBatchFromJson(
  const char* json_path, int num_batch, ArrowArray* out) {
  ArrowErrorInit(&global_error);
  return ConvertError(ExportBatchFromJson(json_path, num_batch, out, &global_error));
 }
 
-DLL_EXPORT const char* nanoarrow_CDataIntegration_ImportBatchAndCompareToJson(
+NANOARROW_DLL_EXPORT const char* nanoarrow_CDataIntegration_ImportBatchAndCompareToJson(
  const char* json_path, int num_batch, ArrowArray* batch) {
  ArrowErrorInit(&global_error);
  return ConvertError(

src/nanoarrow/integration/c_data_integration.h

@@ -18,14 +18,9 @@
 #ifndef NANOARROW_INTEGRATION_C_DATA_INTEGRATION_H_INCLUDED
 #define NANOARROW_INTEGRATION_C_DATA_INTEGRATION_H_INCLUDED
 
+#include <nanoarrow/nanoarrow_types.h>
 #include <stdint.h>
 
-#if defined(_MSC_VER)
-#define DLL_EXPORT __declspec(dllexport)
-#else
-#define DLL_EXPORT
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -76,19 +71,19 @@ struct ArrowArray {
 #endif // ARROW_C_DATA_INTERFACE
 #endif // ARROW_FLAG_DICTIONARY_ORDERED
 
-DLL_EXPORT const char* nanoarrow_CDataIntegration_ExportSchemaFromJson(
+NANOARROW_DLL_EXPORT const char* nanoarrow_CDataIntegration_ExportSchemaFromJson(
  const char* json_path, struct ArrowSchema* out);
 
-DLL_EXPORT const char* nanoarrow_CDataIntegration_ImportSchemaAndCompareToJson(
+NANOARROW_DLL_EXPORT const char* nanoarrow_CDataIntegration_ImportSchemaAndCompareToJson(
  const char* json_path, struct ArrowSchema* schema);
 
-DLL_EXPORT const char* nanoarrow_CDataIntegration_ExportBatchFromJson(
+NANOARROW_DLL_EXPORT const char* nanoarrow_CDataIntegration_ExportBatchFromJson(
  const char* json_path, int num_batch, struct ArrowArray* out);
 
-DLL_EXPORT const char* nanoarrow_CDataIntegration_ImportBatchAndCompareToJson(
+NANOARROW_DLL_EXPORT const char* nanoarrow_CDataIntegration_ImportBatchAndCompareToJson(
  const char* json_path, int num_batch, struct ArrowArray* batch);
 
-DLL_EXPORT int64_t nanoarrow_BytesAllocated(void);
+NANOARROW_DLL_EXPORT int64_t nanoarrow_BytesAllocated(void);
 
 #ifdef __cplusplus
 }

src/nanoarrow/meson.build

@@ -39,23 +39,13 @@ configure_file(input: 'nanoarrow_config.h.in',
  output: 'nanoarrow_config.h',
  configuration: conf_data)
 
-# Windows shared libraries are not exporting the right symbols
-# See https://github.com/mesonbuild/wrapdb/pull/1536#issuecomment-2136011408
-# and https://github.com/apache/arrow-nanoarrow/issues/495
-if host_machine.system() == 'windows'
- libtype = 'static_library'
-else
- libtype = 'library'
-endif
-
-nanoarrow_lib = build_target(
+nanoarrow_lib = library(
  'nanoarrow',
  'array.c',
  'schema.c',
  'array_stream.c',
  'utils.c',
  install: true,
- target_type: libtype,
 )
 
 curdir = include_directories('.') # only needed when used as subproject?
@@ -67,13 +57,12 @@ nanoarrow_dep = declare_dependency(include_directories: [curdir, incdir],
 if get_option('ipc')
  flatcc_dep = dependency('flatcc')
 
- nanoarrow_ipc_lib = build_target(
+ nanoarrow_ipc_lib = library(
  'nanoarrow_ipc',
  'nanoarrow_ipc_decoder.c',
  'nanoarrow_ipc_reader.c',
  dependencies: [nanoarrow_dep, flatcc_dep],
  install: true,
- target_type: libtype,
  )
  nanoarrow_ipc_dep = declare_dependency(include_directories: [incdir],
  link_with: nanoarrow_ipc_lib,
@@ -99,12 +88,11 @@ if needs_device
  error('CUDA support with the Meson build system is not implemented')
  endif
 
- nanoarrow_device_lib = build_target(
+ nanoarrow_device_lib = library(
  'nanoarrow_device',
  sources: device_srcs,
  dependencies: device_deps,
  install: true,
- target_type: libtype,
  cpp_args: device_defines,
  )
 endif