From d5454c6f9ca42956a8e0a20fa008b34fe4ed4506 Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Wed, 7 Nov 2012 23:23:21 +0100 Subject: Fix a bunch of warnings by patching windom and Hermes headers. --- sdk/recipes/patches/hermes/src.H_Clear.h.p | 11 ++++++++ sdk/recipes/patches/hermes/src.H_Format.h.p | 11 ++++++++ sdk/recipes/patches/hermes/src.H_Pal.h.p | 11 ++++++++ sdk/recipes/patches/hermes/src.H_Types.h.p | 11 ++++++++ sdk/recipes/patches/hermes/src.Hermes.h.p | 16 +++++++++++ sdk/recipes/patches/windom/include.mt_wndm.h.p | 39 ++++++++++++++++++++++++++ sdk/recipes/patches/windom/include.windom.h.p | 30 ++++++++++++++++++++ 7 files changed, 129 insertions(+) create mode 100644 sdk/recipes/patches/hermes/src.H_Clear.h.p create mode 100644 sdk/recipes/patches/hermes/src.H_Format.h.p create mode 100644 sdk/recipes/patches/hermes/src.H_Pal.h.p create mode 100644 sdk/recipes/patches/hermes/src.H_Types.h.p create mode 100644 sdk/recipes/patches/hermes/src.Hermes.h.p create mode 100644 sdk/recipes/patches/windom/include.mt_wndm.h.p create mode 100644 sdk/recipes/patches/windom/include.windom.h.p (limited to 'sdk/recipes/patches') diff --git a/sdk/recipes/patches/hermes/src.H_Clear.h.p b/sdk/recipes/patches/hermes/src.H_Clear.h.p new file mode 100644 index 0000000..79f615a --- /dev/null +++ b/sdk/recipes/patches/hermes/src.H_Clear.h.p @@ -0,0 +1,11 @@ +--- src/H_Clear.h.orig 2012-11-07 23:02:45.000000000 +0100 ++++ src/H_Clear.h 2012-11-07 23:05:47.000000000 +0100 +@@ -22,7 +22,7 @@ + /* + Get a handle for a new clearer instance to work with. Returns 0 if failed. + */ +-HERMES_C HermesHandle HERMES_API Hermes_ClearerInstance(); ++HERMES_C HermesHandle HERMES_API Hermes_ClearerInstance(void); + + + /* diff --git a/sdk/recipes/patches/hermes/src.H_Format.h.p b/sdk/recipes/patches/hermes/src.H_Format.h.p new file mode 100644 index 0000000..0a4181f --- /dev/null +++ b/sdk/recipes/patches/hermes/src.H_Format.h.p @@ -0,0 +1,11 @@ +--- src/H_Format.h.orig 2012-11-07 23:02:54.000000000 +0100 ++++ src/H_Format.h 2012-11-07 23:05:47.000000000 +0100 +@@ -17,7 +17,7 @@ + int32 colorkey; /* colorkey, if has_colorkey is 1 */ + } HermesFormat; + +-HERMES_C HermesFormat* HERMES_API Hermes_FormatNewEmpty(); ++HERMES_C HermesFormat* HERMES_API Hermes_FormatNewEmpty(void); + + /* Create a new format structure, returns 0 if failed. + */ diff --git a/sdk/recipes/patches/hermes/src.H_Pal.h.p b/sdk/recipes/patches/hermes/src.H_Pal.h.p new file mode 100644 index 0000000..0b4e1f0 --- /dev/null +++ b/sdk/recipes/patches/hermes/src.H_Pal.h.p @@ -0,0 +1,11 @@ +--- src/H_Pal.h.orig 2012-11-07 23:02:21.000000000 +0100 ++++ src/H_Pal.h 2012-11-07 23:05:47.000000000 +0100 +@@ -21,7 +21,7 @@ + /* Get a handle for a palette to work with. This allocates memory for an + internal palette. Returns 0 if failed. + */ +-HERMES_C HermesHandle HERMES_API Hermes_PaletteInstance(); ++HERMES_C HermesHandle HERMES_API Hermes_PaletteInstance(void); + + + /* diff --git a/sdk/recipes/patches/hermes/src.H_Types.h.p b/sdk/recipes/patches/hermes/src.H_Types.h.p new file mode 100644 index 0000000..d7c9b9c --- /dev/null +++ b/sdk/recipes/patches/hermes/src.H_Types.h.p @@ -0,0 +1,11 @@ +--- src/H_Types.h.orig 2012-11-07 23:03:02.000000000 +0100 ++++ src/H_Types.h 2012-11-07 23:05:47.000000000 +0100 +@@ -16,7 +16,7 @@ + + typedef int HermesHandle; + +-#if (_MSC_VER>=1000) || defined(__VISUALC__) ++#if (defined(_MSC_VER) && (_MSC_VER>=1000)) || defined(__VISUALC__) + + typedef unsigned __int32 int32; + typedef unsigned __int16 short16; diff --git a/sdk/recipes/patches/hermes/src.Hermes.h.p b/sdk/recipes/patches/hermes/src.Hermes.h.p new file mode 100644 index 0000000..19de6ec --- /dev/null +++ b/sdk/recipes/patches/hermes/src.Hermes.h.p @@ -0,0 +1,16 @@ +--- src/Hermes.h.orig 2012-11-07 23:02:36.000000000 +0100 ++++ src/Hermes.h 2012-11-07 23:05:47.000000000 +0100 +@@ -17,11 +17,11 @@ + #include "H_Config.h" + + /* Initialise Hermes, returns 0 if failed */ +-HERMES_C int HERMES_API Hermes_Init(); ++HERMES_C int HERMES_API Hermes_Init(void); + + + /* Deinitialise Hermes, returns 0 if failed */ +-HERMES_C int HERMES_API Hermes_Done(); ++HERMES_C int HERMES_API Hermes_Done(void); + + + #endif diff --git a/sdk/recipes/patches/windom/include.mt_wndm.h.p b/sdk/recipes/patches/windom/include.mt_wndm.h.p new file mode 100644 index 0000000..3265ed2 --- /dev/null +++ b/sdk/recipes/patches/windom/include.mt_wndm.h.p @@ -0,0 +1,39 @@ +--- ./include/mt_wndm.h.orig 2012-11-07 22:35:39.000000000 +0100 ++++ ./include/mt_wndm.h 2012-11-07 22:38:14.000000000 +0100 +@@ -1013,7 +1013,7 @@ + /* Object library */ + /** @addtogroup Object + * @{ */ +-/* int mt_ObjcAttach ( APPvar *app, int mode, WINDOW *win, int __index, int type, ...);*/ ++int mt_ObjcAttach ( APPvar *app, int mode, WINDOW *win, int __index, int type, ...); + int mt_ObjcChange ( APPvar *app, int mode, void *data, int __index, int state, int redraw); + int mt_ObjcChar ( APPvar *app, OBJECT *tree, int idx, int put); + int mt_ObjcDrawParent ( APPvar *app, int mode, void *win, int __index, int parent_depth, int child_depth); +@@ -1055,27 +1055,22 @@ + * \a value_when_selected if the object is selected. + */ + static inline int mt_ObjcAttachVar( APPvar *app, int mode, WINDOW *win, int __index, int *var, int value_when_selected ) { +- int mt_ObjcAttach ( APPvar *, int, WINDOW *, int, int, ...); + return mt_ObjcAttach( app, mode, win, __index, BIND_VAR, var, value_when_selected); + } + + static inline int mt_ObjcAttachBit( APPvar *app, int mode, WINDOW *win, int __index, int *var, int bit ) { +- int mt_ObjcAttach ( APPvar *, int, WINDOW *, int, int, ...); + return mt_ObjcAttach( app, mode, win, __index, BIND_BIT, var, bit); + } + + static inline int mt_ObjcAttachFormFunc( APPvar *app, WINDOW *win, int __index, func_bind fn, void *data ) { +- int mt_ObjcAttach ( APPvar *, int, WINDOW *, int, int, ...); + return mt_ObjcAttach( app, OC_FORM, win, __index, BIND_FUNC, fn, data); + } + + static inline int mt_ObjcAttachTBFunc( APPvar *app, WINDOW *win, int __index, func_bind fn, void *data ) { +- int mt_ObjcAttach ( APPvar *, int, WINDOW *, int, int, ...); + return mt_ObjcAttach( app, OC_TOOLBAR, win, __index, BIND_FUNC, fn, data); + } + + static inline int mt_ObjcAttachMenuFunc( APPvar *app, WINDOW *win, int __index, func_bindmenu fn, void *data ) { +- int mt_ObjcAttach ( APPvar *, int, WINDOW *, int, int, ...); + return mt_ObjcAttach( app, OC_MENU, win, __index, BIND_FUNC, fn, data); + } + diff --git a/sdk/recipes/patches/windom/include.windom.h.p b/sdk/recipes/patches/windom/include.windom.h.p new file mode 100644 index 0000000..e18bf8d --- /dev/null +++ b/sdk/recipes/patches/windom/include.windom.h.p @@ -0,0 +1,30 @@ +--- ./include/windom.h.orig 2012-11-07 22:35:46.000000000 +0100 ++++ ./include/windom.h 2012-11-07 22:39:06.000000000 +0100 +@@ -594,27 +594,22 @@ + } + + static inline int ObjcAttachVar( int mode, WINDOW *win, int __index, int *var, int value_when_selected ) { +- int mt_ObjcAttach ( APPvar *, int, WINDOW *, int, int, ...); + return mt_ObjcAttach( gl_appvar, mode, win, __index, BIND_VAR, var, value_when_selected); + } + + static inline int ObjcAttachBit( int mode, WINDOW *win, int __index, int *var, int bit ) { +- int mt_ObjcAttach ( APPvar *, int, WINDOW *, int, int, ...); + return mt_ObjcAttach( gl_appvar, mode, win, __index, BIND_BIT, var, bit); + } + + static inline int ObjcAttachFormFunc( WINDOW *win, int __index, func_bind fn, void *data ) { +- int mt_ObjcAttach ( APPvar *, int, WINDOW *, int, int, ...); + return mt_ObjcAttach( gl_appvar, OC_FORM, win, __index, BIND_FUNC, fn, data); + } + + static inline int ObjcAttachTBFunc( WINDOW *win, int __index, func_bind fn, void *data ) { +- int mt_ObjcAttach ( APPvar *, int, WINDOW *, int, int, ...); + return mt_ObjcAttach( gl_appvar, OC_TOOLBAR, win, __index, BIND_FUNC, fn, data); + } + + static inline int ObjcAttachMenuFunc( WINDOW *win, int __index, func_bindmenu fn, void *data ) { +- int mt_ObjcAttach ( APPvar *, int, WINDOW *, int, int, ...); + return mt_ObjcAttach( gl_appvar, OC_MENU, win, __index, BIND_FUNC, fn, data); + } + -- cgit v1.2.3