Add support for win x86-32

Author: daugeldauge

.gitignore

@@ -7,8 +7,9 @@
 # Libraries
 *.lib
 *.la
-*.a
 *.lo
+*.a
+!libs/*/libffi.a
 
 # Shared objects (inc. Windows DLLs)
 *.dll

Makefile

@@ -1,7 +1,7 @@
 CC = gcc
 RM = rm
 
-CFLAGS = -Wall -g -Wextra -m64 -fpic
+CFLAGS = -Wall -Wextra -fpic -O2 -fno-strict-aliasing
 
 SYS := $(shell gcc -dumpmachine)
 ifneq (, $(findstring linux, $(SYS)))
@@ -15,11 +15,15 @@ ifneq (, $(findstring linux, $(SYS)))
 	endif
 
 else ifneq (, $(findstring mingw, $(SYS)))
-	
+	ifneq (, $(findstring x86_64, $(SYS)))
+		PLATFORM = x86-64
+	else 
+		PLATFORM = x86-32
+	endif
 	SUFFIX = dll
 	LDFLAGS = -mdll
-	LIBS = -L./libs -lffi
-	CFLAGS += -I./libs/include
+	LIBS = -L./libs/$(PLATFORM)/ -lffi
+	CFLAGS += -I./libs/$(PLATFORM)/include/
 	ifndef GLOBALS_HOME
 		GLOBALS_HOME = C:/InterSystems/Cache
 	endif

cna.c

@@ -28,33 +28,35 @@
   #define FIND_ENTRY(HANDLE, NAME) dlsym(HANDLE, NAME)
 #endif /* _WIN32 */
 
-void
+inline void
 logger(const char *format, ...)
 {
-  va_list args;
-  va_start(args, format);
-  
-  #ifdef _WIN32
-    char path[MAX_PATH];
-    HMODULE hm;
-    GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, (LPCSTR) &logger, &hm);
-    GetModuleFileNameA(hm, path, sizeof(path));
-    strcpy(strrchr(path, '\\') + 1, "log.txt");
-
-    FILE *fd = fopen(path, "a");
-    if (!fd) {
-      return;
-    }
-    time_t now;
-    time(&now);
-    fprintf(fd, "%s\t", ctime(&now));
-    vfprintf(fd, format, args);
-    fclose(fd);
-  #else
-    vprintf(format, args);
-  #endif /* _WIN32 */
-  
-  va_end(args);
+  #ifdef DEBUG
+    va_list args;
+    va_start(args, format);
+    
+    #ifdef _WIN32
+      char path[MAX_PATH];
+      HMODULE hm;
+      GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, (LPCSTR) &logger, &hm);
+      GetModuleFileNameA(hm, path, sizeof(path));
+      strcpy(strrchr(path, '\\') + 1, "log.txt");
+
+      FILE *fd = fopen(path, "a");
+      if (!fd) {
+        return;
+      }
+      time_t now;
+      time(&now);
+      fprintf(fd, "%s\t", ctime(&now));
+      vfprintf(fd, format, args);
+      fclose(fd);
+    #else
+      vprintf(format, args);
+    #endif /* _WIN32 */
+    
+    va_end(args);
+  #endif /* DEBUG */
 }
 
 
@@ -302,7 +304,7 @@ call_function(ZARRAYP libID, const char *funcname, ZARRAYP argtypes, ZARRAYP arg
   void *ffi_values[maxargs];
 
   int i, j;
-  size_t fullsize = 0, size;
+  size_t fullsize = 0, size = 0;
   storage mem;
   init_storage(&mem);