test 2

lidavidm · Mar 16, 2024 · 8747450 · 8747450
1 parent e1d27c7
commit 8747450
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/c/driver/postgresql/copy/copy_common.h b/c/driver/postgresql/copy/copy_common.h
@@ -18,7 +18,9 @@
 #pragma once
 
 // Windows
+#if !defined(NOMINMAX)
 #define NOMINMAX
+#endif
 
 #include <cstdint>
 

diff --git a/r/adbcpostgresql/src/init.c → r/adbcpostgresql/src/init.cc b/r/adbcpostgresql/src/init.c → r/adbcpostgresql/src/init.cc
@@ -21,6 +21,7 @@
 
 #include <adbc.h>
 
+extern "C" {
 AdbcStatusCode AdbcDriverInit(int version, void* raw_driver, struct AdbcError* error);
 
 static SEXP init_func_xptr = 0;
@@ -41,3 +42,4 @@ void R_init_adbcpostgresql(DllInfo* dll) {
   R_PreserveObject(init_func_xptr);
   UNPROTECT(1);
 }
+}
diff --git a/r/adbcsqlite/src/init.c → r/adbcsqlite/src/init.cc b/r/adbcsqlite/src/init.c → r/adbcsqlite/src/init.cc
@@ -21,6 +21,7 @@
 
 #include <adbc.h>
 
+extern "C" {
 AdbcStatusCode SqliteDriverInit(int version, void* raw_driver, struct AdbcError* error);
 
 static SEXP init_func_xptr = 0;
@@ -40,3 +41,4 @@ void R_init_adbcsqlite(DllInfo* dll) {
   R_PreserveObject(init_func_xptr);
   UNPROTECT(1);
 }
+}