inc: Update the new bindings to fix several translation bugs

Author: dkl

inc/CUnit/CUnit.bi

@@ -63,16 +63,16 @@
 		CU_assertImplementation(-((actual) <> (expected)), __LINE__, ((("CU_ASSERT_NOT_EQUAL_FATAL(" + #actual) + ",") + #expected) + ")", __FILE__, "", CU_TRUE)
 #endmacro
 #macro CU_ASSERT_PTR_EQUAL(actual, expected)
-		CU_assertImplementation(cptr(const any ptr, -((actual) = cptr(const any ptr, (expected)))), __LINE__, ((("CU_ASSERT_PTR_EQUAL(" + #actual) + ",") + #expected) + ")", __FILE__, "", CU_FALSE)
+		CU_assertImplementation(-(cptr(const any ptr, (actual)) = cptr(const any ptr, (expected))), __LINE__, ((("CU_ASSERT_PTR_EQUAL(" + #actual) + ",") + #expected) + ")", __FILE__, "", CU_FALSE)
 #endmacro
 #macro CU_ASSERT_PTR_EQUAL_FATAL(actual, expected)
-		CU_assertImplementation(cptr(const any ptr, -((actual) = cptr(const any ptr, (expected)))), __LINE__, ((("CU_ASSERT_PTR_EQUAL_FATAL(" + #actual) + ",") + #expected) + ")", __FILE__, "", CU_TRUE)
+		CU_assertImplementation(-(cptr(const any ptr, (actual)) = cptr(const any ptr, (expected))), __LINE__, ((("CU_ASSERT_PTR_EQUAL_FATAL(" + #actual) + ",") + #expected) + ")", __FILE__, "", CU_TRUE)
 #endmacro
 #macro CU_ASSERT_PTR_NOT_EQUAL(actual, expected)
-		CU_assertImplementation(cptr(const any ptr, -((actual) <> cptr(const any ptr, (expected)))), __LINE__, ((("CU_ASSERT_PTR_NOT_EQUAL(" + #actual) + ",") + #expected) + ")", __FILE__, "", CU_FALSE)
+		CU_assertImplementation(-(cptr(const any ptr, (actual)) <> cptr(const any ptr, (expected))), __LINE__, ((("CU_ASSERT_PTR_NOT_EQUAL(" + #actual) + ",") + #expected) + ")", __FILE__, "", CU_FALSE)
 #endmacro
 #macro CU_ASSERT_PTR_NOT_EQUAL_FATAL(actual, expected)
-		CU_assertImplementation(cptr(const any ptr, -((actual) <> cptr(const any ptr, (expected)))), __LINE__, ((("CU_ASSERT_PTR_NOT_EQUAL_FATAL(" + #actual) + ",") + #expected) + ")", __FILE__, "", CU_TRUE)
+		CU_assertImplementation(-(cptr(const any ptr, (actual)) <> cptr(const any ptr, (expected))), __LINE__, ((("CU_ASSERT_PTR_NOT_EQUAL_FATAL(" + #actual) + ",") + #expected) + ")", __FILE__, "", CU_TRUE)
 #endmacro
 #macro CU_ASSERT_PTR_NULL(value)
 		CU_assertImplementation(-(NULL = cptr(const any ptr, (value))), __LINE__, ("CU_ASSERT_PTR_NULL(" + #value) + ")", __FILE__, "", CU_FALSE)
@@ -111,14 +111,14 @@
 		CU_assertImplementation(strncmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected)), cuint((count))), __LINE__, ((((("CU_ASSERT_NSTRING_NOT_EQUAL_FATAL(" + #actual) + ",") + #expected) + ",") + #count) + ")", __FILE__, "", CU_TRUE)
 #endmacro
 #macro CU_ASSERT_DOUBLE_EQUAL(actual, expected, granularity)
-		CU_assertImplementation(-(fabs(cast(double, (actual) - (expected))) <= fabs(cast(double, (granularity)))), __LINE__, ((((("CU_ASSERT_DOUBLE_EQUAL(" + #actual) + ",") + #expected) + ",") + #granularity) + ")", __FILE__, "", CU_FALSE)
+		CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) <= fabs(cdbl((granularity)))), __LINE__, ((((("CU_ASSERT_DOUBLE_EQUAL(" + #actual) + ",") + #expected) + ",") + #granularity) + ")", __FILE__, "", CU_FALSE)
 #endmacro
 #macro CU_ASSERT_DOUBLE_EQUAL_FATAL(actual, expected, granularity)
-		CU_assertImplementation(-(fabs(cast(double, (actual) - (expected))) <= fabs(cast(double, (granularity)))), __LINE__, ((((("CU_ASSERT_DOUBLE_EQUAL_FATAL(" + #actual) + ",") + #expected) + ",") + #granularity) + ")", __FILE__, "", CU_TRUE)
+		CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) <= fabs(cdbl((granularity)))), __LINE__, ((((("CU_ASSERT_DOUBLE_EQUAL_FATAL(" + #actual) + ",") + #expected) + ",") + #granularity) + ")", __FILE__, "", CU_TRUE)
 #endmacro
 #macro CU_ASSERT_DOUBLE_NOT_EQUAL(actual, expected, granularity)
-		CU_assertImplementation(-(fabs(cast(double, (actual) - (expected))) > fabs(cast(double, (granularity)))), __LINE__, ((((("CU_ASSERT_DOUBLE_NOT_EQUAL(" + #actual) + ",") + #expected) + ",") + #granularity) + ")", __FILE__, "", CU_FALSE)
+		CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) > fabs(cdbl((granularity)))), __LINE__, ((((("CU_ASSERT_DOUBLE_NOT_EQUAL(" + #actual) + ",") + #expected) + ",") + #granularity) + ")", __FILE__, "", CU_FALSE)
 #endmacro
 #macro CU_ASSERT_DOUBLE_NOT_EQUAL_FATAL(actual, expected, granularity)
-		CU_assertImplementation(-(fabs(cast(double, (actual) - (expected))) > fabs(cast(double, (granularity)))), __LINE__, ((((("CU_ASSERT_DOUBLE_NOT_EQUAL_FATAL(" + #actual) + ",") + #expected) + ",") + #granularity) + ")", __FILE__, "", CU_TRUE)
+		CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) > fabs(cdbl((granularity)))), __LINE__, ((((("CU_ASSERT_DOUBLE_NOT_EQUAL_FATAL(" + #actual) + ",") + #expected) + ",") + #granularity) + ")", __FILE__, "", CU_TRUE)
 #endmacro

inc/allegro.bi

@@ -20,8 +20,8 @@
 ''     #define EMPTY_STRING => EMPTY_STRING_
 ''     #define SYSTEM_NONE => SYSTEM_NONE_
 ''     #define MOUSEDRV_NONE => MOUSEDRV_NONE_
-''     #define DRAW_SPRITE_H_FLIP => DRAW_SPRITE_H_FLIP_
 ''     #define DRAW_SPRITE_V_FLIP => DRAW_SPRITE_V_FLIP_
+''     #define DRAW_SPRITE_H_FLIP => DRAW_SPRITE_H_FLIP_
 ''     #define DRAW_SPRITE_VH_FLIP => DRAW_SPRITE_VH_FLIP_
 ''     #define MIDI_DIGMID => MIDI_DIGMID_
 ''     #define EOF => EOF_
@@ -81,13 +81,13 @@ type GFX_VTABLE as GFX_VTABLE_
 type GFX_MODE as GFX_MODE_
 type RLE_SPRITE as RLE_SPRITE_
 type FONT_GLYPH as FONT_GLYPH_
-type FONT as FONT_
 type FONT_VTABLE as FONT_VTABLE_
+type FONT as FONT_
 type DIALOG as DIALOG_
 type PACKFILE as PACKFILE_
+type PACKFILE_VTABLE as PACKFILE_VTABLE_
 type LZSS_PACK_DATA as LZSS_PACK_DATA_
 type LZSS_UNPACK_DATA as LZSS_UNPACK_DATA_
-type PACKFILE_VTABLE as PACKFILE_VTABLE_
 
 #define ALLEGRO_H
 #define ALLEGRO_BASE_H
@@ -257,12 +257,15 @@ type PACKFILE_VTABLE as PACKFILE_VTABLE_
 	#define _farnspeekl(addr) (*cptr(ulong ptr, (addr)))
 #endif
 
-#define READ3BYTES(p) (((*cptr(ubyte ptr, (p))) or ((*cptr(ubyte ptr, (p) + 1)) shl 8)) or ((*cptr(ubyte ptr, (p) + 2)) shl 16))
+#define READ3BYTES(p) _
+	( cptr(ubyte ptr, (p))[0]        or _
+	 (cptr(ubyte ptr, (p))[1] shl 8) or _
+	 (cptr(ubyte ptr, (p))[2] shl 16) )
 #macro WRITE3BYTES(p, c)
 	scope
-		*cptr(ubyte ptr, (p)) = (c)
-		*cptr(ubyte ptr, (p) + 1) = (c) shr 8
-		*cptr(ubyte ptr, (p) + 2) = (c) shr 16
+		cptr(ubyte ptr, (p))[0] = (c)
+		cptr(ubyte ptr, (p))[1] = (c) shr 8
+		cptr(ubyte ptr, (p))[2] = (c) shr 16
 	end scope
 #endmacro
 
@@ -336,13 +339,13 @@ declare function uwidth_max(byval type_ as long) as long
 #define EMPTY_STRING_ !"\0\0\0"
 
 extern _AL_DLL empty_string as zstring * 4
-extern ugetc as function(byval s as const zstring ptr) as long
-extern ugetx as function(byval s as zstring ptr ptr) as long
-extern ugetxc as function(byval s as const zstring ptr ptr) as long
-extern usetc as function(byval s as zstring ptr, byval c as long) as long
-extern uwidth as function(byval s as const zstring ptr) as long
-extern ucwidth as function(byval c as long) as long
-extern uisok as function(byval c as long) as long
+extern _AL_DLL ugetc as function(byval s as const zstring ptr) as long
+extern _AL_DLL ugetx as function(byval s as zstring ptr ptr) as long
+extern _AL_DLL ugetxc as function(byval s as const zstring ptr ptr) as long
+extern _AL_DLL usetc as function(byval s as zstring ptr, byval c as long) as long
+extern _AL_DLL uwidth as function(byval s as const zstring ptr) as long
+extern _AL_DLL ucwidth as function(byval c as long) as long
+extern _AL_DLL uisok as function(byval c as long) as long
 
 declare function uoffset(byval s as const zstring ptr, byval idx as long) as long
 declare function ugetat(byval s as const zstring ptr, byval idx as long) as long
@@ -662,7 +665,7 @@ extern _AL_DLL freeze_mouse_flag as long
 #define MOUSE_FLAG_MOVE_Z 128
 #define MOUSE_FLAG_MOVE_W 256
 
-extern mouse_callback as sub(byval flags as long)
+extern _AL_DLL mouse_callback as sub(byval flags as long)
 
 declare sub show_mouse(byval bmp as BITMAP ptr)
 declare sub scare_mouse()
@@ -683,8 +686,8 @@ declare function mouse_on_screen() as long
 
 #define ALLEGRO_TIMER_H
 #define TIMERS_PER_SECOND cast(clong, 1193181)
-#define SECS_TO_TIMER(x) cast(clong, (x) * TIMERS_PER_SECOND)
-#define MSEC_TO_TIMER(x) cast(clong, (x) * (TIMERS_PER_SECOND / 1000))
+#define SECS_TO_TIMER(x) (cast(clong, (x)) * TIMERS_PER_SECOND)
+#define MSEC_TO_TIMER(x) (cast(clong, (x)) * (TIMERS_PER_SECOND / 1000))
 #define BPS_TO_TIMER(x) (TIMERS_PER_SECOND / cast(clong, (x)))
 #define BPM_TO_TIMER(x) ((60 * TIMERS_PER_SECOND) / cast(clong, (x)))
 
@@ -750,9 +753,9 @@ declare sub remove_keyboard()
 declare function poll_keyboard() as long
 declare function keyboard_needs_poll() as long
 
-extern keyboard_callback as function(byval key as long) as long
-extern keyboard_ucallback as function(byval key as long, byval scancode as long ptr) as long
-extern keyboard_lowlevel_callback as sub(byval scancode as long)
+extern _AL_DLL keyboard_callback as function(byval key as long) as long
+extern _AL_DLL keyboard_ucallback as function(byval key as long, byval scancode as long ptr) as long
+extern _AL_DLL keyboard_lowlevel_callback as sub(byval scancode as long)
 
 declare sub install_keyboard_hooks(byval keypressed as function() as long, byval readkey as function() as long)
 
@@ -2058,22 +2061,19 @@ extern _AL_DLL gui_button_proc as DIALOG_PROC
 extern _AL_DLL gui_edit_proc as DIALOG_PROC
 extern _AL_DLL gui_list_proc as DIALOG_PROC
 extern _AL_DLL gui_text_list_proc as DIALOG_PROC
-
-extern gui_menu_draw_menu as sub(byval x as long, byval y as long, byval w as long, byval h as long)
-extern gui_menu_draw_menu_item as sub(byval m as MENU ptr, byval x as long, byval y as long, byval w as long, byval h as long, byval bar as long, byval sel as long)
-
+extern _AL_DLL gui_menu_draw_menu as sub(byval x as long, byval y as long, byval w as long, byval h as long)
+extern _AL_DLL gui_menu_draw_menu_item as sub(byval m as MENU ptr, byval x as long, byval y as long, byval w as long, byval h as long, byval bar as long, byval sel as long)
 extern _AL_DLL active_dialog as DIALOG ptr
 extern _AL_DLL active_menu as MENU ptr
 extern _AL_DLL gui_mouse_focus as long
 extern _AL_DLL gui_fg_color as long
 extern _AL_DLL gui_mg_color as long
 extern _AL_DLL gui_bg_color as long
 extern _AL_DLL gui_font_baseline as long
-
-extern gui_mouse_x as function() as long
-extern gui_mouse_y as function() as long
-extern gui_mouse_z as function() as long
-extern gui_mouse_b as function() as long
+extern _AL_DLL gui_mouse_x as function() as long
+extern _AL_DLL gui_mouse_y as function() as long
+extern _AL_DLL gui_mouse_z as function() as long
+extern _AL_DLL gui_mouse_b as function() as long
 
 declare sub gui_set_screen(byval bmp as BITMAP ptr)
 declare function gui_get_screen() as BITMAP ptr
@@ -2241,7 +2241,7 @@ declare function start_sound_input(byval rate as long, byval bits as long, byval
 declare sub stop_sound_input()
 declare function read_sound_input(byval buffer as any ptr) as long
 
-extern digi_recorder as sub()
+extern _AL_DLL digi_recorder as sub()
 
 declare sub lock_sample(byval spl as SAMPLE ptr)
 declare sub register_sample_file_type(byval ext as const zstring ptr, byval load as function(byval filename as const zstring ptr) as SAMPLE ptr, byval save as function(byval filename as const zstring ptr, byval spl as SAMPLE ptr) as long)
@@ -2267,14 +2267,14 @@ declare sub free_audio_stream_buffer(byval stream as AUDIOSTREAM ptr)
 #define MIDI_VOICES 64
 #define MIDI_TRACKS 32
 
-type __dummyid_5_extracted_allegro_4_4_2_include_allegro_midi
+type __MIDI_track
 	data as ubyte ptr
 	len as long
 end type
 
 type MIDI
 	divisions as long
-	track(0 to 31) as __dummyid_5_extracted_allegro_4_4_2_include_allegro_midi
+	track(0 to 31) as __MIDI_track
 end type
 
 #define MIDI_AUTODETECT (-1)
@@ -2338,10 +2338,10 @@ declare function get_midi_length(byval midi as MIDI ptr) as long
 declare sub midi_out(byval data_ as ubyte ptr, byval length as long)
 declare function load_midi_patches() as long
 
-extern midi_msg_callback as sub(byval msg as long, byval byte1 as long, byval byte2 as long)
-extern midi_meta_callback as sub(byval type_ as long, byval data_ as const ubyte ptr, byval length as long)
-extern midi_sysex_callback as sub(byval data_ as const ubyte ptr, byval length as long)
-extern midi_recorder as sub(byval data_ as ubyte)
+extern _AL_DLL midi_msg_callback as sub(byval msg as long, byval byte1 as long, byval byte2 as long)
+extern _AL_DLL midi_meta_callback as sub(byval type_ as long, byval data_ as const ubyte ptr, byval length as long)
+extern _AL_DLL midi_sysex_callback as sub(byval data_ as const ubyte ptr, byval length as long)
+extern _AL_DLL midi_recorder as sub(byval data_ as ubyte)
 
 declare sub lock_midi(byval midi as MIDI ptr)
 declare sub reserve_voices(byval digi_voices_ as long, byval midi_voices_ as long)
@@ -2769,7 +2769,7 @@ declare sub set_window_close_hook(byval proc as sub())
 declare sub set_clip(byval bitmap as BITMAP ptr, byval x1 as long, byval y_1 as long, byval x2 as long, byval y2 as long)
 declare sub yield_timeslice()
 
-extern retrace_proc as sub()
+extern _AL_DLL retrace_proc as sub()
 
 declare sub set_file_encoding(byval encoding_ as long)
 declare function get_file_encoding() as long

inc/allegro/algif.bi

@@ -1,4 +1,5 @@
 #pragma once
+#inclib "algif"
 
 #include once "allegro.bi"
 

inc/allegro/alpng.bi

@@ -1,4 +1,5 @@
 #pragma once
+#inclib "alpng"
 
 #include once "allegro.bi"
 

inc/allegro5/allegro.bi

@@ -64,12 +64,15 @@ type ALLEGRO_COND as ALLEGRO_COND_
 
 #define __al_included_allegro5_astdint_h
 #define __al_included_allegro5_astdbool_h
-#define READ3BYTES(p) (((*cptr(ubyte ptr, (p))) or ((*cptr(ubyte ptr, (p) + 1)) shl 8)) or ((*cptr(ubyte ptr, (p) + 2)) shl 16))
+#define READ3BYTES(p) _
+	( cptr(ubyte ptr, (p))[0]        or _
+	 (cptr(ubyte ptr, (p))[1] shl 8) or _
+	 (cptr(ubyte ptr, (p))[2] shl 16) )
 #macro WRITE3BYTES(p, c)
 	scope
-		*cptr(ubyte ptr, (p)) = (c)
-		*cptr(ubyte ptr, (p) + 1) = (c) shr 8
-		*cptr(ubyte ptr, (p) + 2) = (c) shr 16
+		cptr(ubyte ptr, (p))[0] = (c)
+		cptr(ubyte ptr, (p))[1] = (c) shr 8
+		cptr(ubyte ptr, (p))[2] = (c) shr 16
 	end scope
 #endmacro
 #define bmp_write16(addr, c) *cptr(ushort ptr, (addr)) = (c)
@@ -478,7 +481,7 @@ declare sub _al_trace_suffix(byval msg as const zstring ptr, ...)
 #define ALLEGRO_WARN ALLEGRO_TRACE_LEVEL(2)
 #define ALLEGRO_ERROR ALLEGRO_TRACE_LEVEL(3)
 
-extern _al_user_assert_handler as sub(byval expr as const zstring ptr, byval file as const zstring ptr, byval line_ as long, byval func as const zstring ptr)
+extern _AL_DLL _al_user_assert_handler as sub(byval expr as const zstring ptr, byval file as const zstring ptr, byval line_ as long, byval func as const zstring ptr)
 
 declare sub al_register_assert_handler(byval handler as sub(byval expr as const zstring ptr, byval file as const zstring ptr, byval line_ as long, byval func as const zstring ptr))
 
@@ -863,12 +866,12 @@ declare function al_get_display_mode(byval index as long, byval mode as ALLEGRO_
 #define _AL_MAX_JOYSTICK_STICKS 8
 #define _AL_MAX_JOYSTICK_BUTTONS 32
 
-type __dummyid_0_extracted_allegro_5_0_10_include_allegro5_joystick
+type __ALLEGRO_JOYSTICK_STATE_stick
 	axis(0 to 2) as single
 end type
 
 type ALLEGRO_JOYSTICK_STATE
-	stick(0 to 7) as __dummyid_0_extracted_allegro_5_0_10_include_allegro5_joystick
+	stick(0 to 7) as __ALLEGRO_JOYSTICK_STATE_stick
 	button(0 to 31) as long
 end type
 
@@ -1280,6 +1283,10 @@ declare function al_check_inverse(byval trans as const ALLEGRO_TRANSFORM ptr, by
 	declare function _WinMain(byval _main as any ptr, byval hInst as any ptr, byval hPrev as any ptr, byval Cmd as zstring ptr, byval nShow as long) as long
 
 	#define AL_JOY_TYPE_DIRECTX AL_ID(asc("D"), asc("X"), asc(" "), asc(" "))
+
+	extern _AL_DLL _al_joydrv_directx as ALLEGRO_JOYSTICK_DRIVER
+
+	#define _AL_JOYSTICK_DRIVER_DIRECTX ( AL_JOY_TYPE_DIRECTX, @_al_joydrv_directx, true ),
 #endif
 
 end extern

inc/allegro5/allegro_audio.bi

@@ -28,8 +28,6 @@ enum
 	ALLEGRO_AUDIO_DEPTH_UINT24 = ALLEGRO_AUDIO_DEPTH_INT24 or ALLEGRO_AUDIO_DEPTH_UNSIGNED
 end enum
 
-#define ALLEGRO_MAX_CHANNELS 8
-
 type ALLEGRO_CHANNEL_CONF as long
 enum
 	ALLEGRO_CHANNEL_CONF_1 = &h10
@@ -41,6 +39,8 @@ enum
 	ALLEGRO_CHANNEL_CONF_7_1 = &h71
 end enum
 
+#define ALLEGRO_MAX_CHANNELS 8
+
 type ALLEGRO_PLAYMODE as long
 enum
 	ALLEGRO_PLAYMODE_ONCE = &h100

inc/cgui.bi

@@ -12,8 +12,8 @@
 extern "C"
 
 #ifndef FONT
-type BITMAP as BITMAP_
 type FONT as FONT_
+type BITMAP as BITMAP_
 type DATAFILE as DATAFILE_
 #endif
 

inc/curl.bi

@@ -96,13 +96,6 @@ type CURL as any
 #endif
 
 #define curl_socket_typedef
-#define HTTPPOST_FILENAME (1 shl 0)
-#define HTTPPOST_READFILE (1 shl 1)
-#define HTTPPOST_PTRNAME (1 shl 2)
-#define HTTPPOST_PTRCONTENTS (1 shl 3)
-#define HTTPPOST_BUFFER (1 shl 4)
-#define HTTPPOST_PTRBUFFER (1 shl 5)
-#define HTTPPOST_CALLBACK (1 shl 6)
 
 type curl_httppost
 	next as curl_httppost ptr
@@ -120,6 +113,14 @@ type curl_httppost
 	userp as any ptr
 end type
 
+#define HTTPPOST_FILENAME (1 shl 0)
+#define HTTPPOST_READFILE (1 shl 1)
+#define HTTPPOST_PTRNAME (1 shl 2)
+#define HTTPPOST_PTRCONTENTS (1 shl 3)
+#define HTTPPOST_BUFFER (1 shl 4)
+#define HTTPPOST_PTRBUFFER (1 shl 5)
+#define HTTPPOST_CALLBACK (1 shl 6)
+
 type curl_progress_callback as function(byval clientp as any ptr, byval dltotal as double, byval dlnow as double, byval ultotal as double, byval ulnow as double) as long
 type curl_xferinfo_callback as function(byval clientp as any ptr, byval dltotal as curl_off_t, byval dlnow as curl_off_t, byval ultotal as curl_off_t, byval ulnow as curl_off_t) as long
 
@@ -151,7 +152,7 @@ end enum
 #define CURLFINFOFLAG_KNOWN_SIZE (1 shl 6)
 #define CURLFINFOFLAG_KNOWN_HLINKCOUNT (1 shl 7)
 
-type __dummyid_29_extracted_curl_7_39_0_include_curl_curl
+type __curl_fileinfo_strings
 	time as zstring ptr
 	perm as zstring ptr
 	user as zstring ptr
@@ -168,7 +169,7 @@ type curl_fileinfo
 	gid as long
 	size as curl_off_t
 	hardlinks as clong
-	strings as __dummyid_29_extracted_curl_7_39_0_include_curl_curl
+	strings as __curl_fileinfo_strings
 	flags as ulong
 	b_data as zstring ptr
 	b_size as uinteger
@@ -551,8 +552,6 @@ end enum
 #define CURLOPTTYPE_OBJECTPOINT 10000
 #define CURLOPTTYPE_FUNCTIONPOINT 20000
 #define CURLOPTTYPE_OFF_T 30000
-#define CURLOPT_XFERINFODATA CURLOPT_PROGRESSDATA
-#define CURLOPT_SERVER_RESPONSE_TIMEOUT CURLOPT_FTP_RESPONSE_TIMEOUT
 
 type CURLoption as long
 enum
@@ -771,6 +770,8 @@ enum
 	CURLOPT_LASTENTRY
 end enum
 
+#define CURLOPT_XFERINFODATA CURLOPT_PROGRESSDATA
+#define CURLOPT_SERVER_RESPONSE_TIMEOUT CURLOPT_FTP_RESPONSE_TIMEOUT
 #define CURLOPT_POST301 CURLOPT_POSTREDIR
 #define CURLOPT_SSLKEYPASSWD CURLOPT_KEYPASSWD
 #define CURLOPT_FTPAPPEND CURLOPT_APPEND
@@ -1167,15 +1168,15 @@ enum
 	CURLMSG_LAST
 end enum
 
-union __dummyid_56_extracted_curl_7_39_0_include_curl_multi
+union __CURLMsg__data
 	whatever as any ptr
 	result as CURLcode
 end union
 
 type CURLMsg_
 	msg as CURLMSG
 	easy_handle as CURL ptr
-	data as __dummyid_56_extracted_curl_7_39_0_include_curl_multi
+	data as __CURLMsg__data
 end type
 
 #define CURL_WAIT_POLLIN &h0001