  #    include "dynload_darwin.c"
  #  else
  #    include "dynload_unix.c"
-Index: /Users/ochafik/src/dyncall/dyncall/dyncallback/dyncall_callback_x86_gas.S
-===================================================================
---- /home/ubuntu/src/dyncall/dyncall/dynload/dynload_syms_elf.c	(revision 671)
-+++ /home/ubuntu/src/dyncall/dyncall/dynload/dynload_syms_elf.c	(working copy)
-@@ -20,6 +20,7 @@
- 
- #if defined(DC__OS_Linux) && !defined(_GNU_SOURCE)
- #define _GNU_SOURCE
-+#define __USE_GNU
- #endif
- 
- /*
-Index: /home/ubuntu/src/dyncall/dyncall/dyncallback/dyncall_callback_x86_gas.S
-===================================================================
---- /home/ubuntu/src/dyncall/dyncall/dyncallback/dyncall_callback_x86_gas.S	(revision 671)
-+++ /home/ubuntu/src/dyncall/dyncall/dyncallback/dyncall_callback_x86_gas.S	(working copy)
-@@ -95,21 +95,25 @@
- 
- 	// handle return value
- 
-+	cmp %al, 'v'
-+	je .return_void
- 	cmp %al, 'd'
- 	je .return_f64
- 	cmp %al, 'f'
- 	je .return_f32
- 	cmp %al, 'l'
- 	je .return_i64
--	cmp %al, 'i'
--	je .return_i32
--	ret
-+	cmp %al, 'L'
-+	je .return_i64_
-+	
-+	// All int cases <= 32 bits (+ pointer & string cases) fall in the 32 bits int case
- 
- .return_i32:
- 	mov  %eax, [%edx]
- 	ret
- 
- .return_i64:
-+.return_i64_:
- 	mov  %eax, [%edx]
- 	mov  %edx, [%edx+4]
- 	ret
-@@ -121,3 +125,6 @@
- .return_f64:
- 	fld qword ptr [%edx]
- 	ret
-+
-+.return_void:
-+  	ret
-Index: /Users/ochafik/src/dyncall/dyncall/dyncallback/dyncall_callback_x86_masm.asm
-===================================================================
---- /Users/ochafik/src/dyncall/dyncall/dyncallback/dyncall_callback_x86_masm.asm	(revision 670)
-+++ /Users/ochafik/src/dyncall/dyncall/dyncallback/dyncall_callback_x86_masm.asm	(working copy)
-@@ -93,16 +93,19 @@
-   mov  ebp, [ebp]                    ; EBP = parent frame
- 
-   ; handle return value
-+  
-+  cmp al, 'v'
-+  je return_void
-   cmp al, 'd'
-   je return_f64
-   cmp al, 'f'
-   je return_f32
-   cmp al, 'l'
-   je return_i64
--  cmp al, 'i'
--  je return_i32
--  ret
--
-+  cmp al, 'L'
-+  je return_i64
-+  ; All int cases <= 32 bits (+ pointer & string cases) fall in the 32 bits int case
-+  
- return_i32:
-   mov  eax, [edx]
-   ret
-@@ -120,6 +123,9 @@
-   fld qword ptr [edx]
-   ret
- 
-+return_void:
-+  ret
-+
- _dcCallbackThunkEntry ENDP
- 
- END
-Index: /Users/ochafik/src/dyncall/dyncall/dyncallback/dyncall_callback_x86_apple.s
-===================================================================
---- /Users/ochafik/src/dyncall/dyncall/dyncallback/dyncall_callback_x86_apple.s	(revision 670)
-+++ /Users/ochafik/src/dyncall/dyncall/dyncallback/dyncall_callback_x86_apple.s	(working copy)
-@@ -44,10 +44,12 @@
- frame_DCArgs       = -24
- frame_DCValue      = -32
- 
-+ASCII_L = 76
- ASCII_l = 108
- ASCII_d	= 100
- ASCII_f = 102
- ASCII_i = 105
-+ASCII_v = 118
- 
- _dcCallbackThunkEntry:
- 	push %ebp
-@@ -96,21 +98,25 @@
- 
- 	// handle return value
- 
-+	cmp %al, ASCII_v
-+	je .return_void
- 	cmp %al, ASCII_d
- 	je .return_f64
- 	cmp %al, ASCII_f
- 	je .return_f32
- 	cmp %al, ASCII_l
- 	je .return_i64
--	cmp %al, ASCII_i
--	je .return_i32
--	ret
-+	cmp %al, ASCII_L
-+	je .return_i64_
-+	
-+	// All int cases <= 32 bits (+ pointer & string cases) fall in the 32 bits int case	
- 
- .return_i32:
- 	mov  %eax, [%edx]
- 	ret
- 
- .return_i64:
-+.return_i64_:
- 	mov  %eax, [%edx]
- 	mov  %edx, [%edx+4]
- 	ret
-@@ -122,3 +128,6 @@
- .return_f64:
- 	fld qword ptr [%edx]
- 	ret
-+
-+.return_void:
-+	ret
+Index: /Users/ochafik/src/dyncall/dyncall/buildsys/gmake/prolog.gmake
+===================================================================
+--- /Users/ochafik/src/dyncall/dyncall/buildsys/gmake/prolog.gmake	(revision 745)
++++ /Users/ochafik/src/dyncall/dyncall/buildsys/gmake/prolog.gmake	(working copy)
+@@ -28,7 +28,7 @@
+ 
+ # config settings
+ 
+-$(if $(wildcard "${TOP}/ConfigVars"),$(error hmm),$(error File 'ConfigVars' not found at top directory. Run 'configure' - or, if you use CMake, run 'make -f Makefile' please.))
++#$(if $(wildcard "${TOP}/ConfigVars"),$(error hmm),$(error File 'ConfigVars' not found at top directory. Run 'configure' - or, if you use CMake, run 'make -f Makefile' please.))
+ include $(TOP)/ConfigVars
+ 
+ 

 #    include "dynload_syms_elf.c"
Index: /Users/ochafik/src/dyncall/dyncall/dynload/dynload_syms_mach-o.c
===================================================================
--- /Users/ochafik/src/dyncall/dyncall/dynload/dynload_syms_mach-o.c	(revision 670)
+++ /Users/ochafik/src/dyncall/dyncall/dynload/dynload_syms_mach-o.c	(working copy)
@@ -33,9 +33,11 @@
 

 	const struct NLIST_TYPE* nl;
Index: /Users/ochafik/src/dyncall/dyncall/dynload/dynload.c
===================================================================
--- /Users/ochafik/src/dyncall/dyncall/dynload/dynload.c	(revision 745)
+++ /Users/ochafik/src/dyncall/dyncall/dynload/dynload.c	(working copy)
@@ -18,11 +18,14 @@
 */
 
 #include "dynload.h"
+//#include "dynload_macros.h"
 #include "dyncall_macros.h"
+//#include "dyncall_alloc.h"
+
 #if defined(DC_WINDOWS)
 #  include "dynload_windows.c"
 #elif defined(DC_UNIX)
