inc: winapi fixes and more #defines turned into constants

* many more #defines are now turned into proper constants, for example
  those with math expressions referencing other constants (e.g.
   <#define B (A + 1)>) are now turned into constants, while
  previously it was just alias-#defines (i.e. <#define B A>). In case of
  the Windows API binding, uses of MinGw-w64's __MSABI_LONG() macro are
  now removed (or rather, expanded), which also allowed lots of #defines
  to become constants. See also 34b46cf.

* winapi: culng() casts added for win/commctrl.bi's NM_* constants (and
  also a few other cases) where they were missing. See also d26035a.
  http://www.freebasic.net/forum/viewtopic.php?f=6&t=23901

Author: dkl

Diff for: changelog.txt

@@ -60,6 +60,7 @@ Version 1.04.0
 - Many bindings and especially the Windows API binding now use more proper Const/Type/Extern/Sub/Function declarations instead of #defines, allowing many identifiers (such as "LoadImage" which is also a Windows API function) to be used for custom functions in namespaces, even if the file #includes windows.bi or others.
 - 1.02.0 regression: Windows API binding: COM interfaces in win/shlobj.bi were missing vtable entries
 - #761: crt/string.bi and win/shlwapi.bi can now be used together - they use #undefs to override each-other (e.g. strcpy() vs StrCpy()), whichever is #included last wins.
+- Windows API binding: The NM_* constants from win/commctrl.bi are now adjusted to work on 64bit.
 
 
 Version 1.03.0

Diff for: inc/GL/glfw.bi

@@ -75,76 +75,76 @@ const GLFW_PRESS = 1
 const GLFW_KEY_UNKNOWN = -1
 const GLFW_KEY_SPACE = 32
 const GLFW_KEY_SPECIAL = 256
-#define GLFW_KEY_ESC (GLFW_KEY_SPECIAL + 1)
-#define GLFW_KEY_F1 (GLFW_KEY_SPECIAL + 2)
-#define GLFW_KEY_F2 (GLFW_KEY_SPECIAL + 3)
-#define GLFW_KEY_F3 (GLFW_KEY_SPECIAL + 4)
-#define GLFW_KEY_F4 (GLFW_KEY_SPECIAL + 5)
-#define GLFW_KEY_F5 (GLFW_KEY_SPECIAL + 6)
-#define GLFW_KEY_F6 (GLFW_KEY_SPECIAL + 7)
-#define GLFW_KEY_F7 (GLFW_KEY_SPECIAL + 8)
-#define GLFW_KEY_F8 (GLFW_KEY_SPECIAL + 9)
-#define GLFW_KEY_F9 (GLFW_KEY_SPECIAL + 10)
-#define GLFW_KEY_F10 (GLFW_KEY_SPECIAL + 11)
-#define GLFW_KEY_F11 (GLFW_KEY_SPECIAL + 12)
-#define GLFW_KEY_F12 (GLFW_KEY_SPECIAL + 13)
-#define GLFW_KEY_F13 (GLFW_KEY_SPECIAL + 14)
-#define GLFW_KEY_F14 (GLFW_KEY_SPECIAL + 15)
-#define GLFW_KEY_F15 (GLFW_KEY_SPECIAL + 16)
-#define GLFW_KEY_F16 (GLFW_KEY_SPECIAL + 17)
-#define GLFW_KEY_F17 (GLFW_KEY_SPECIAL + 18)
-#define GLFW_KEY_F18 (GLFW_KEY_SPECIAL + 19)
-#define GLFW_KEY_F19 (GLFW_KEY_SPECIAL + 20)
-#define GLFW_KEY_F20 (GLFW_KEY_SPECIAL + 21)
-#define GLFW_KEY_F21 (GLFW_KEY_SPECIAL + 22)
-#define GLFW_KEY_F22 (GLFW_KEY_SPECIAL + 23)
-#define GLFW_KEY_F23 (GLFW_KEY_SPECIAL + 24)
-#define GLFW_KEY_F24 (GLFW_KEY_SPECIAL + 25)
-#define GLFW_KEY_F25 (GLFW_KEY_SPECIAL + 26)
-#define GLFW_KEY_UP (GLFW_KEY_SPECIAL + 27)
-#define GLFW_KEY_DOWN (GLFW_KEY_SPECIAL + 28)
-#define GLFW_KEY_LEFT (GLFW_KEY_SPECIAL + 29)
-#define GLFW_KEY_RIGHT (GLFW_KEY_SPECIAL + 30)
-#define GLFW_KEY_LSHIFT (GLFW_KEY_SPECIAL + 31)
-#define GLFW_KEY_RSHIFT (GLFW_KEY_SPECIAL + 32)
-#define GLFW_KEY_LCTRL (GLFW_KEY_SPECIAL + 33)
-#define GLFW_KEY_RCTRL (GLFW_KEY_SPECIAL + 34)
-#define GLFW_KEY_LALT (GLFW_KEY_SPECIAL + 35)
-#define GLFW_KEY_RALT (GLFW_KEY_SPECIAL + 36)
-#define GLFW_KEY_TAB (GLFW_KEY_SPECIAL + 37)
-#define GLFW_KEY_ENTER (GLFW_KEY_SPECIAL + 38)
-#define GLFW_KEY_BACKSPACE (GLFW_KEY_SPECIAL + 39)
-#define GLFW_KEY_INSERT (GLFW_KEY_SPECIAL + 40)
-#define GLFW_KEY_DEL (GLFW_KEY_SPECIAL + 41)
-#define GLFW_KEY_PAGEUP (GLFW_KEY_SPECIAL + 42)
-#define GLFW_KEY_PAGEDOWN (GLFW_KEY_SPECIAL + 43)
-#define GLFW_KEY_HOME (GLFW_KEY_SPECIAL + 44)
-#define GLFW_KEY_END (GLFW_KEY_SPECIAL + 45)
-#define GLFW_KEY_KP_0 (GLFW_KEY_SPECIAL + 46)
-#define GLFW_KEY_KP_1 (GLFW_KEY_SPECIAL + 47)
-#define GLFW_KEY_KP_2 (GLFW_KEY_SPECIAL + 48)
-#define GLFW_KEY_KP_3 (GLFW_KEY_SPECIAL + 49)
-#define GLFW_KEY_KP_4 (GLFW_KEY_SPECIAL + 50)
-#define GLFW_KEY_KP_5 (GLFW_KEY_SPECIAL + 51)
-#define GLFW_KEY_KP_6 (GLFW_KEY_SPECIAL + 52)
-#define GLFW_KEY_KP_7 (GLFW_KEY_SPECIAL + 53)
-#define GLFW_KEY_KP_8 (GLFW_KEY_SPECIAL + 54)
-#define GLFW_KEY_KP_9 (GLFW_KEY_SPECIAL + 55)
-#define GLFW_KEY_KP_DIVIDE (GLFW_KEY_SPECIAL + 56)
-#define GLFW_KEY_KP_MULTIPLY (GLFW_KEY_SPECIAL + 57)
-#define GLFW_KEY_KP_SUBTRACT (GLFW_KEY_SPECIAL + 58)
-#define GLFW_KEY_KP_ADD (GLFW_KEY_SPECIAL + 59)
-#define GLFW_KEY_KP_DECIMAL (GLFW_KEY_SPECIAL + 60)
-#define GLFW_KEY_KP_EQUAL (GLFW_KEY_SPECIAL + 61)
-#define GLFW_KEY_KP_ENTER (GLFW_KEY_SPECIAL + 62)
-#define GLFW_KEY_KP_NUM_LOCK (GLFW_KEY_SPECIAL + 63)
-#define GLFW_KEY_CAPS_LOCK (GLFW_KEY_SPECIAL + 64)
-#define GLFW_KEY_SCROLL_LOCK (GLFW_KEY_SPECIAL + 65)
-#define GLFW_KEY_PAUSE (GLFW_KEY_SPECIAL + 66)
-#define GLFW_KEY_LSUPER (GLFW_KEY_SPECIAL + 67)
-#define GLFW_KEY_RSUPER (GLFW_KEY_SPECIAL + 68)
-#define GLFW_KEY_MENU (GLFW_KEY_SPECIAL + 69)
-#define GLFW_KEY_LAST GLFW_KEY_MENU
+const GLFW_KEY_ESC = GLFW_KEY_SPECIAL + 1
+const GLFW_KEY_F1 = GLFW_KEY_SPECIAL + 2
+const GLFW_KEY_F2 = GLFW_KEY_SPECIAL + 3
+const GLFW_KEY_F3 = GLFW_KEY_SPECIAL + 4
+const GLFW_KEY_F4 = GLFW_KEY_SPECIAL + 5
+const GLFW_KEY_F5 = GLFW_KEY_SPECIAL + 6
+const GLFW_KEY_F6 = GLFW_KEY_SPECIAL + 7
+const GLFW_KEY_F7 = GLFW_KEY_SPECIAL + 8
+const GLFW_KEY_F8 = GLFW_KEY_SPECIAL + 9
+const GLFW_KEY_F9 = GLFW_KEY_SPECIAL + 10
+const GLFW_KEY_F10 = GLFW_KEY_SPECIAL + 11
+const GLFW_KEY_F11 = GLFW_KEY_SPECIAL + 12
+const GLFW_KEY_F12 = GLFW_KEY_SPECIAL + 13
+const GLFW_KEY_F13 = GLFW_KEY_SPECIAL + 14
+const GLFW_KEY_F14 = GLFW_KEY_SPECIAL + 15
+const GLFW_KEY_F15 = GLFW_KEY_SPECIAL + 16
+const GLFW_KEY_F16 = GLFW_KEY_SPECIAL + 17
+const GLFW_KEY_F17 = GLFW_KEY_SPECIAL + 18
+const GLFW_KEY_F18 = GLFW_KEY_SPECIAL + 19
+const GLFW_KEY_F19 = GLFW_KEY_SPECIAL + 20
+const GLFW_KEY_F20 = GLFW_KEY_SPECIAL + 21
+const GLFW_KEY_F21 = GLFW_KEY_SPECIAL + 22
+const GLFW_KEY_F22 = GLFW_KEY_SPECIAL + 23
+const GLFW_KEY_F23 = GLFW_KEY_SPECIAL + 24
+const GLFW_KEY_F24 = GLFW_KEY_SPECIAL + 25
+const GLFW_KEY_F25 = GLFW_KEY_SPECIAL + 26
+const GLFW_KEY_UP = GLFW_KEY_SPECIAL + 27
+const GLFW_KEY_DOWN = GLFW_KEY_SPECIAL + 28
+const GLFW_KEY_LEFT = GLFW_KEY_SPECIAL + 29
+const GLFW_KEY_RIGHT = GLFW_KEY_SPECIAL + 30
+const GLFW_KEY_LSHIFT = GLFW_KEY_SPECIAL + 31
+const GLFW_KEY_RSHIFT = GLFW_KEY_SPECIAL + 32
+const GLFW_KEY_LCTRL = GLFW_KEY_SPECIAL + 33
+const GLFW_KEY_RCTRL = GLFW_KEY_SPECIAL + 34
+const GLFW_KEY_LALT = GLFW_KEY_SPECIAL + 35
+const GLFW_KEY_RALT = GLFW_KEY_SPECIAL + 36
+const GLFW_KEY_TAB = GLFW_KEY_SPECIAL + 37
+const GLFW_KEY_ENTER = GLFW_KEY_SPECIAL + 38
+const GLFW_KEY_BACKSPACE = GLFW_KEY_SPECIAL + 39
+const GLFW_KEY_INSERT = GLFW_KEY_SPECIAL + 40
+const GLFW_KEY_DEL = GLFW_KEY_SPECIAL + 41
+const GLFW_KEY_PAGEUP = GLFW_KEY_SPECIAL + 42
+const GLFW_KEY_PAGEDOWN = GLFW_KEY_SPECIAL + 43
+const GLFW_KEY_HOME = GLFW_KEY_SPECIAL + 44
+const GLFW_KEY_END = GLFW_KEY_SPECIAL + 45
+const GLFW_KEY_KP_0 = GLFW_KEY_SPECIAL + 46
+const GLFW_KEY_KP_1 = GLFW_KEY_SPECIAL + 47
+const GLFW_KEY_KP_2 = GLFW_KEY_SPECIAL + 48
+const GLFW_KEY_KP_3 = GLFW_KEY_SPECIAL + 49
+const GLFW_KEY_KP_4 = GLFW_KEY_SPECIAL + 50
+const GLFW_KEY_KP_5 = GLFW_KEY_SPECIAL + 51
+const GLFW_KEY_KP_6 = GLFW_KEY_SPECIAL + 52
+const GLFW_KEY_KP_7 = GLFW_KEY_SPECIAL + 53
+const GLFW_KEY_KP_8 = GLFW_KEY_SPECIAL + 54
+const GLFW_KEY_KP_9 = GLFW_KEY_SPECIAL + 55
+const GLFW_KEY_KP_DIVIDE = GLFW_KEY_SPECIAL + 56
+const GLFW_KEY_KP_MULTIPLY = GLFW_KEY_SPECIAL + 57
+const GLFW_KEY_KP_SUBTRACT = GLFW_KEY_SPECIAL + 58
+const GLFW_KEY_KP_ADD = GLFW_KEY_SPECIAL + 59
+const GLFW_KEY_KP_DECIMAL = GLFW_KEY_SPECIAL + 60
+const GLFW_KEY_KP_EQUAL = GLFW_KEY_SPECIAL + 61
+const GLFW_KEY_KP_ENTER = GLFW_KEY_SPECIAL + 62
+const GLFW_KEY_KP_NUM_LOCK = GLFW_KEY_SPECIAL + 63
+const GLFW_KEY_CAPS_LOCK = GLFW_KEY_SPECIAL + 64
+const GLFW_KEY_SCROLL_LOCK = GLFW_KEY_SPECIAL + 65
+const GLFW_KEY_PAUSE = GLFW_KEY_SPECIAL + 66
+const GLFW_KEY_LSUPER = GLFW_KEY_SPECIAL + 67
+const GLFW_KEY_RSUPER = GLFW_KEY_SPECIAL + 68
+const GLFW_KEY_MENU = GLFW_KEY_SPECIAL + 69
+const GLFW_KEY_LAST = GLFW_KEY_MENU
 const GLFW_MOUSE_BUTTON_1 = 0
 const GLFW_MOUSE_BUTTON_2 = 1
 const GLFW_MOUSE_BUTTON_3 = 2

Diff for: inc/Lua/lauxlib.bi

@@ -34,7 +34,7 @@
 extern "C"
 
 #define lauxlib_h
-#define LUA_ERRFILE (LUA_ERRERR + 1)
+const LUA_ERRFILE = LUA_ERRERR + 1
 
 type luaL_Reg
 	name as const zstring ptr

Diff for: inc/Lua/lua.bi

@@ -43,8 +43,8 @@
 
 '' The following symbols have been renamed:
 ''     typedef LUA_NUMBER => LUA_NUMBER_
-''     typedef LUA_UNSIGNED => LUA_UNSIGNED_
 ''     typedef LUA_INTEGER => LUA_INTEGER_
+''     typedef LUA_UNSIGNED => LUA_UNSIGNED_
 ''     typedef LUA_KCONTEXT => LUA_KCONTEXT_
 ''     #define LUA_VERSION => LUA_VERSION_
 ''     constant LUA_YIELD => LUA_YIELD_
@@ -181,7 +181,7 @@ const LUA_VERSION_NUM = 503
 #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
 #define LUA_SIGNATURE !"\27Lua"
 const LUA_MULTRET = -1
-#define LUA_REGISTRYINDEX ((-LUAI_MAXSTACK) - 1000)
+const LUA_REGISTRYINDEX = (-LUAI_MAXSTACK) - 1000
 #define lua_upvalueindex(i) (LUA_REGISTRYINDEX - (i))
 const LUA_OK = 0
 const LUA_YIELD_ = 1
@@ -388,10 +388,10 @@ const LUA_HOOKRET = 1
 const LUA_HOOKLINE = 2
 const LUA_HOOKCOUNT = 3
 const LUA_HOOKTAILCALL = 4
-#define LUA_MASKCALL (1 shl LUA_HOOKCALL)
-#define LUA_MASKRET (1 shl LUA_HOOKRET)
-#define LUA_MASKLINE (1 shl LUA_HOOKLINE)
-#define LUA_MASKCOUNT (1 shl LUA_HOOKCOUNT)
+const LUA_MASKCALL = 1 shl LUA_HOOKCALL
+const LUA_MASKRET = 1 shl LUA_HOOKRET
+const LUA_MASKLINE = 1 shl LUA_HOOKLINE
+const LUA_MASKCOUNT = 1 shl LUA_HOOKCOUNT
 type lua_Debug as lua_Debug_
 type lua_Hook as sub(byval L as lua_State ptr, byval ar as lua_Debug ptr)
 

Diff for: inc/SDL/SDL.bi

@@ -291,7 +291,7 @@ const SDL_BYTEORDER = SDL_LIL_ENDIAN
 #define SDL_SwapBE64(X) SDL_Swap64(X)
 #define _SDL_mutex_h
 const SDL_MUTEX_TIMEDOUT = 1
-#define SDL_MUTEX_MAXWAIT (not cast(Uint32, 0))
+const SDL_MUTEX_MAXWAIT = not cast(Uint32, 0)
 type SDL_mutex as SDL_mutex_
 declare function SDL_CreateMutex() as SDL_mutex ptr
 #define SDL_LockMutex(m) SDL_mutexP(m)
@@ -793,10 +793,10 @@ enum
 	KMOD_RESERVED = &h8000
 end enum
 
-#define KMOD_CTRL (KMOD_LCTRL or KMOD_RCTRL)
-#define KMOD_SHIFT (KMOD_LSHIFT or KMOD_RSHIFT)
-#define KMOD_ALT (KMOD_LALT or KMOD_RALT)
-#define KMOD_META (KMOD_LMETA or KMOD_RMETA)
+const KMOD_CTRL = KMOD_LCTRL or KMOD_RCTRL
+const KMOD_SHIFT = KMOD_LSHIFT or KMOD_RSHIFT
+const KMOD_ALT = KMOD_LALT or KMOD_RALT
+const KMOD_META = KMOD_LMETA or KMOD_RMETA
 
 type SDL_keysym
 	scancode as Uint8
@@ -1090,10 +1090,10 @@ const SDL_HAT_UP = &h01
 const SDL_HAT_RIGHT = &h02
 const SDL_HAT_DOWN = &h04
 const SDL_HAT_LEFT = &h08
-#define SDL_HAT_RIGHTUP (SDL_HAT_RIGHT or SDL_HAT_UP)
-#define SDL_HAT_RIGHTDOWN (SDL_HAT_RIGHT or SDL_HAT_DOWN)
-#define SDL_HAT_LEFTUP (SDL_HAT_LEFT or SDL_HAT_UP)
-#define SDL_HAT_LEFTDOWN (SDL_HAT_LEFT or SDL_HAT_DOWN)
+const SDL_HAT_RIGHTUP = SDL_HAT_RIGHT or SDL_HAT_UP
+const SDL_HAT_RIGHTDOWN = SDL_HAT_RIGHT or SDL_HAT_DOWN
+const SDL_HAT_LEFTUP = SDL_HAT_LEFT or SDL_HAT_UP
+const SDL_HAT_LEFTDOWN = SDL_HAT_LEFT or SDL_HAT_DOWN
 
 declare function SDL_JoystickGetHat(byval joystick as SDL_Joystick ptr, byval hat as long) as Uint8
 declare function SDL_JoystickGetBall(byval joystick as SDL_Joystick ptr, byval ball as long, byval dx as long ptr, byval dy as long ptr) as long

Diff for: inc/SDL2/SDL.bi

@@ -348,7 +348,7 @@ end function
 #define SDL_SwapFloatBE(X) SDL_SwapFloat(X)
 #define _SDL_mutex_h
 const SDL_MUTEX_TIMEDOUT = 1
-#define SDL_MUTEX_MAXWAIT (not cast(Uint32, 0))
+const SDL_MUTEX_MAXWAIT = not cast(Uint32, 0)
 type SDL_mutex as SDL_mutex_
 declare function SDL_CreateMutex() as SDL_mutex ptr
 #define SDL_mutexP(m) SDL_LockMutex(m)
@@ -558,7 +558,7 @@ const AUDIO_F32SYS = AUDIO_F32LSB
 const SDL_AUDIO_ALLOW_FREQUENCY_CHANGE = &h00000001
 const SDL_AUDIO_ALLOW_FORMAT_CHANGE = &h00000002
 const SDL_AUDIO_ALLOW_CHANNELS_CHANGE = &h00000004
-#define SDL_AUDIO_ALLOW_ANY_CHANGE ((SDL_AUDIO_ALLOW_FREQUENCY_CHANGE or SDL_AUDIO_ALLOW_FORMAT_CHANGE) or SDL_AUDIO_ALLOW_CHANNELS_CHANGE)
+const SDL_AUDIO_ALLOW_ANY_CHANGE = (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE or SDL_AUDIO_ALLOW_FORMAT_CHANGE) or SDL_AUDIO_ALLOW_CHANNELS_CHANGE
 type SDL_AudioCallback as sub(byval userdata as any ptr, byval stream as Uint8 ptr, byval len as long)
 
 type SDL_AudioSpec
@@ -1588,10 +1588,10 @@ enum
 	KMOD_RESERVED = &h8000
 end enum
 
-#define KMOD_CTRL (KMOD_LCTRL or KMOD_RCTRL)
-#define KMOD_SHIFT (KMOD_LSHIFT or KMOD_RSHIFT)
-#define KMOD_ALT (KMOD_LALT or KMOD_RALT)
-#define KMOD_GUI (KMOD_LGUI or KMOD_RGUI)
+const KMOD_CTRL = KMOD_LCTRL or KMOD_RCTRL
+const KMOD_SHIFT = KMOD_LSHIFT or KMOD_RSHIFT
+const KMOD_ALT = KMOD_LALT or KMOD_RALT
+const KMOD_GUI = KMOD_LGUI or KMOD_RGUI
 
 type SDL_Keysym
 	scancode as SDL_Scancode
@@ -1693,10 +1693,10 @@ const SDL_HAT_UP = &h01
 const SDL_HAT_RIGHT = &h02
 const SDL_HAT_DOWN = &h04
 const SDL_HAT_LEFT = &h08
-#define SDL_HAT_RIGHTUP (SDL_HAT_RIGHT or SDL_HAT_UP)
-#define SDL_HAT_RIGHTDOWN (SDL_HAT_RIGHT or SDL_HAT_DOWN)
-#define SDL_HAT_LEFTUP (SDL_HAT_LEFT or SDL_HAT_UP)
-#define SDL_HAT_LEFTDOWN (SDL_HAT_LEFT or SDL_HAT_DOWN)
+const SDL_HAT_RIGHTUP = SDL_HAT_RIGHT or SDL_HAT_UP
+const SDL_HAT_RIGHTDOWN = SDL_HAT_RIGHT or SDL_HAT_DOWN
+const SDL_HAT_LEFTUP = SDL_HAT_LEFT or SDL_HAT_UP
+const SDL_HAT_LEFTDOWN = SDL_HAT_LEFT or SDL_HAT_DOWN
 
 declare function SDL_JoystickGetHat(byval joystick as SDL_Joystick ptr, byval hat as long) as Uint8
 declare function SDL_JoystickGetBall(byval joystick as SDL_Joystick ptr, byval ball as long, byval dx as long ptr, byval dy as long ptr) as long
@@ -1800,7 +1800,7 @@ type SDL_Finger
 	pressure as single
 end type
 
-#define SDL_TOUCH_MOUSEID cast(Uint32, -1)
+const SDL_TOUCH_MOUSEID = cast(Uint32, -1)
 declare function SDL_GetNumTouchDevices() as long
 declare function SDL_GetTouchDevice(byval index as long) as SDL_TouchID
 declare function SDL_GetNumTouchFingers(byval touchID as SDL_TouchID) as long
@@ -2623,7 +2623,7 @@ const SDL_INIT_HAPTIC = &h00001000
 const SDL_INIT_GAMECONTROLLER = &h00002000
 const SDL_INIT_EVENTS = &h00004000
 const SDL_INIT_NOPARACHUTE = &h00100000
-#define SDL_INIT_EVERYTHING ((((((SDL_INIT_TIMER or SDL_INIT_AUDIO) or SDL_INIT_VIDEO) or SDL_INIT_EVENTS) or SDL_INIT_JOYSTICK) or SDL_INIT_HAPTIC) or SDL_INIT_GAMECONTROLLER)
+const SDL_INIT_EVERYTHING = (((((SDL_INIT_TIMER or SDL_INIT_AUDIO) or SDL_INIT_VIDEO) or SDL_INIT_EVENTS) or SDL_INIT_JOYSTICK) or SDL_INIT_HAPTIC) or SDL_INIT_GAMECONTROLLER
 
 declare function SDL_Init(byval flags as Uint32) as long
 declare function SDL_InitSubSystem(byval flags as Uint32) as long

Diff for: inc/X11/Intrinsic.bi

@@ -296,7 +296,7 @@ declare sub XtTranslateKey(byval as Display ptr, byval as KeyCode, byval as Modi
 declare sub XtSetKeyTranslator(byval as Display ptr, byval as XtKeyProc)
 declare sub XtRegisterCaseConverter(byval as Display ptr, byval as XtCaseProc, byval as KeySym, byval as KeySym)
 declare sub XtConvertCase(byval as Display ptr, byval as KeySym, byval as KeySym ptr, byval as KeySym ptr)
-#define XtAllEvents cast(EventMask, -cast(clong, 1))
+const XtAllEvents = cast(EventMask, -cast(clong, 1))
 declare sub XtAddEventHandler(byval as Widget, byval as EventMask, byval as byte, byval as XtEventHandler, byval as XtPointer)
 declare sub XtRemoveEventHandler(byval as Widget, byval as EventMask, byval as byte, byval as XtEventHandler, byval as XtPointer)
 declare sub XtAddRawEventHandler(byval as Widget, byval as EventMask, byval as byte, byval as XtEventHandler, byval as XtPointer)
@@ -337,7 +337,7 @@ const XtIMXEvent = 1
 const XtIMTimer = 2
 const XtIMAlternateInput = 4
 const XtIMSignal = 8
-#define XtIMAll (((XtIMXEvent or XtIMTimer) or XtIMAlternateInput) or XtIMSignal)
+const XtIMAll = ((XtIMXEvent or XtIMTimer) or XtIMAlternateInput) or XtIMSignal
 
 declare function XtPending() as byte
 declare function XtAppPending(byval as XtAppContext) as XtInputMask
@@ -461,10 +461,10 @@ declare sub XtVaGetSubvalues(byval as XtPointer, byval as XtResourceList, byval
 declare sub XtGetResourceList(byval as WidgetClass, byval as XtResourceList ptr, byval as Cardinal ptr)
 declare sub XtGetConstraintResourceList(byval as WidgetClass, byval as XtResourceList ptr, byval as Cardinal ptr)
 
-#define XtUnspecifiedPixmap cast(Pixmap, 2)
+const XtUnspecifiedPixmap = cast(Pixmap, 2)
 const XtUnspecifiedShellInt = -1
-#define XtUnspecifiedWindow cast(Window, 2)
-#define XtUnspecifiedWindowGroup cast(Window, 3)
+const XtUnspecifiedWindow = cast(Window, 2)
+const XtUnspecifiedWindowGroup = cast(Window, 3)
 #define XtCurrentDirectory "XtCurrentDirectory"
 #define XtDefaultForeground "XtDefaultForeground"
 #define XtDefaultBackground "XtDefaultBackground"
@@ -534,7 +534,7 @@ declare sub XtCallbackReleaseCacheRefList(byval as Widget, byval as XtPointer, b
 declare sub XtSetWMColormapWindows(byval as Widget, byval as Widget ptr, byval as Cardinal)
 declare function XtFindFile(byval as const zstring ptr, byval as Substitution, byval as Cardinal, byval as XtFilePredicate) as String_
 declare function XtResolvePathname(byval as Display ptr, byval as const zstring ptr, byval as const zstring ptr, byval as const zstring ptr, byval as const zstring ptr, byval as Substitution, byval as Cardinal, byval as XtFilePredicate) as String_
-#define XT_CONVERT_FAIL cast(XAtom, &h80000001)
+const XT_CONVERT_FAIL = cast(XAtom, &h80000001)
 declare sub XtDisownSelection(byval as Widget, byval as XAtom, byval as Time)
 declare sub XtGetSelectionValue(byval as Widget, byval as XAtom, byval as XAtom, byval as XtSelectionCallbackProc, byval as XtPointer, byval as Time)
 declare sub XtGetSelectionValues(byval as Widget, byval as XAtom, byval as XAtom ptr, byval as long, byval as XtSelectionCallbackProc, byval as XtPointer ptr, byval as Time)

Diff for: inc/X11/IntrinsicP.bi

@@ -74,7 +74,7 @@ type XrmResourceList as XrmResource ptr
 type XtVersionType as culong
 const XT_VERSION = 11
 const XT_REVISION = 6
-#define XtVersion ((XT_VERSION * 1000) + XT_REVISION)
+const XtVersion = (XT_VERSION * 1000) + XT_REVISION
 const XtVersionDontCheck = 0
 
 type XtProc as sub()

Diff for: inc/X11/TranslateI.bi

@@ -287,7 +287,7 @@ type _TMConvertRec
 end type
 
 type TMConvertRec as _TMConvertRec
-#define _XtEventTimerEventType cast(TMLongCard, not cast(clong, 0))
+const _XtEventTimerEventType = cast(TMLongCard, not cast(clong, 0))
 const KeysymModMask = cast(clong, 1) shl 27
 const AnyButtonMask = cast(clong, 1) shl 28
 
@@ -333,7 +333,7 @@ end type
 type ActionHookRec as _ActionHookRec
 type ActionHook as _ActionHookRec ptr
 const TMKEYCACHELOG2 = 6
-#define TMKEYCACHESIZE (1 shl TMKEYCACHELOG2)
+const TMKEYCACHESIZE = 1 shl TMKEYCACHELOG2
 
 type _KeyCacheRec
 	modifiers_return(0 to 255) as ubyte

Diff for: inc/X11/X.bi

@@ -223,8 +223,8 @@ const SyncKeyboard = 4
 const ReplayKeyboard = 5
 const AsyncBoth = 6
 const SyncBoth = 7
-#define RevertToNone clng(None)
-#define RevertToPointerRoot clng(PointerRoot)
+const RevertToNone = clng(None)
+const RevertToPointerRoot = clng(PointerRoot)
 const RevertToParent = 2
 const Success = 0
 const BadRequest = 1