From 08a006d08a4c35d2c3ecc9a3d10cf7fd14661a84 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 29 Jul 2014 17:12:47 +0000 Subject: Rename all patches that contain '::' as a path separator, and use '__' instead. --- emulators/generator/files/patch-hdr::generator.h | 41 ---------------------- emulators/generator/files/patch-hdr__generator.h | 41 ++++++++++++++++++++++ emulators/generator/files/patch-main::ui-gtk.c | 11 ------ emulators/generator/files/patch-main__ui-gtk.c | 11 ++++++ .../patch-src::io::prom::fs::hfsplus::unicode.c | 19 ---------- .../patch-src__io__prom__fs__hfsplus__unicode.c | 19 ++++++++++ emulators/raine/files/patch-source::alleg::blit.c | 11 ------ emulators/raine/files/patch-source::emumain.c | 13 ------- emulators/raine/files/patch-source::gui::rgui.c | 13 ------- emulators/raine/files/patch-source__alleg__blit.c | 11 ++++++ emulators/raine/files/patch-source__emumain.c | 13 +++++++ emulators/raine/files/patch-source__gui__rgui.c | 13 +++++++ 12 files changed, 108 insertions(+), 108 deletions(-) delete mode 100644 emulators/generator/files/patch-hdr::generator.h create mode 100644 emulators/generator/files/patch-hdr__generator.h delete mode 100644 emulators/generator/files/patch-main::ui-gtk.c create mode 100644 emulators/generator/files/patch-main__ui-gtk.c delete mode 100644 emulators/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c create mode 100644 emulators/pearpc/files/patch-src__io__prom__fs__hfsplus__unicode.c delete mode 100644 emulators/raine/files/patch-source::alleg::blit.c delete mode 100644 emulators/raine/files/patch-source::emumain.c delete mode 100644 emulators/raine/files/patch-source::gui::rgui.c create mode 100644 emulators/raine/files/patch-source__alleg__blit.c create mode 100644 emulators/raine/files/patch-source__emumain.c create mode 100644 emulators/raine/files/patch-source__gui__rgui.c (limited to 'emulators') diff --git a/emulators/generator/files/patch-hdr::generator.h b/emulators/generator/files/patch-hdr::generator.h deleted file mode 100644 index 648ed05d7d72..000000000000 --- a/emulators/generator/files/patch-hdr::generator.h +++ /dev/null @@ -1,41 +0,0 @@ ---- hdr/generator.h.orig Mon May 5 03:50:43 2003 -+++ hdr/generator.h Sun Nov 23 04:46:22 2003 -@@ -13,6 +13,10 @@ - void gen_softreset(void); - void gen_loadmemrom(const char *rom, int romlen); - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include -+#endif -+ - #if defined(linux) - #include - #define SWAP16(x) bswap_16((x)) -@@ -21,6 +25,10 @@ - #include - #define SWAP16(x) bswap_16((x)) - #define SWAP32(x) bswap_32((x)) -+#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 -+ #include -+ #define SWAP16(x) (be16toh(x)) -+ #define SWAP32(x) (be32toh(x)) - #else - #define SWAP16(y) (( ((y)>>8) & 0x00ff) | (( ((y)<<8) & 0xff00))) - #define SWAP32(y) (( ((y)>>24) & 0x000000ff) | \ -@@ -221,11 +229,11 @@ - # define LOG_DEBUG3(x) /* ui_log_debug3 ## x */ - # define LOG_DEBUG2(x) /* ui_log_debug2 ## x */ - # define LOG_DEBUG1(x) /* ui_log_debug1 ## x */ --# define LOG_USER(x) ui_log_user ## x --# define LOG_VERBOSE(x) ui_log_verbose ## x --# define LOG_NORMAL(x) ui_log_normal ## x --# define LOG_CRITICAL(x) ui_log_critical ## x --# define LOG_REQUEST(x) ui_log_request ## x -+# define LOG_USER(x) ui_log_user x -+# define LOG_VERBOSE(x) ui_log_verbose x -+# define LOG_NORMAL(x) ui_log_normal x -+# define LOG_CRITICAL(x) ui_log_critical x -+# define LOG_REQUEST(x) ui_log_request x - #endif - - typedef struct { diff --git a/emulators/generator/files/patch-hdr__generator.h b/emulators/generator/files/patch-hdr__generator.h new file mode 100644 index 000000000000..648ed05d7d72 --- /dev/null +++ b/emulators/generator/files/patch-hdr__generator.h @@ -0,0 +1,41 @@ +--- hdr/generator.h.orig Mon May 5 03:50:43 2003 ++++ hdr/generator.h Sun Nov 23 04:46:22 2003 +@@ -13,6 +13,10 @@ + void gen_softreset(void); + void gen_loadmemrom(const char *rom, int romlen); + ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include ++#endif ++ + #if defined(linux) + #include + #define SWAP16(x) bswap_16((x)) +@@ -21,6 +25,10 @@ + #include + #define SWAP16(x) bswap_16((x)) + #define SWAP32(x) bswap_32((x)) ++#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 ++ #include ++ #define SWAP16(x) (be16toh(x)) ++ #define SWAP32(x) (be32toh(x)) + #else + #define SWAP16(y) (( ((y)>>8) & 0x00ff) | (( ((y)<<8) & 0xff00))) + #define SWAP32(y) (( ((y)>>24) & 0x000000ff) | \ +@@ -221,11 +229,11 @@ + # define LOG_DEBUG3(x) /* ui_log_debug3 ## x */ + # define LOG_DEBUG2(x) /* ui_log_debug2 ## x */ + # define LOG_DEBUG1(x) /* ui_log_debug1 ## x */ +-# define LOG_USER(x) ui_log_user ## x +-# define LOG_VERBOSE(x) ui_log_verbose ## x +-# define LOG_NORMAL(x) ui_log_normal ## x +-# define LOG_CRITICAL(x) ui_log_critical ## x +-# define LOG_REQUEST(x) ui_log_request ## x ++# define LOG_USER(x) ui_log_user x ++# define LOG_VERBOSE(x) ui_log_verbose x ++# define LOG_NORMAL(x) ui_log_normal x ++# define LOG_CRITICAL(x) ui_log_critical x ++# define LOG_REQUEST(x) ui_log_request x + #endif + + typedef struct { diff --git a/emulators/generator/files/patch-main::ui-gtk.c b/emulators/generator/files/patch-main::ui-gtk.c deleted file mode 100644 index 9b6181f968b8..000000000000 --- a/emulators/generator/files/patch-main::ui-gtk.c +++ /dev/null @@ -1,11 +0,0 @@ ---- main/ui-gtk.c.orig Sun May 4 09:09:51 2003 -+++ main/ui-gtk.c Sun Nov 23 04:32:57 2003 -@@ -739,7 +739,7 @@ - /* logging is done this way because this was the best I could come up with - whilst battling with macros that can only take fixed numbers of arguments */ - --#define LOG_FUNC(name,level,txt) void ui_log_ ## name ## (const char *text, ...) \ -+#define LOG_FUNC(name,level,txt) void ui_log_ ## name (const char *text, ...) \ - { \ - va_list ap; \ - if (gen_loglevel >= level) { \ diff --git a/emulators/generator/files/patch-main__ui-gtk.c b/emulators/generator/files/patch-main__ui-gtk.c new file mode 100644 index 000000000000..9b6181f968b8 --- /dev/null +++ b/emulators/generator/files/patch-main__ui-gtk.c @@ -0,0 +1,11 @@ +--- main/ui-gtk.c.orig Sun May 4 09:09:51 2003 ++++ main/ui-gtk.c Sun Nov 23 04:32:57 2003 +@@ -739,7 +739,7 @@ + /* logging is done this way because this was the best I could come up with + whilst battling with macros that can only take fixed numbers of arguments */ + +-#define LOG_FUNC(name,level,txt) void ui_log_ ## name ## (const char *text, ...) \ ++#define LOG_FUNC(name,level,txt) void ui_log_ ## name (const char *text, ...) \ + { \ + va_list ap; \ + if (gen_loglevel >= level) { \ diff --git a/emulators/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c b/emulators/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c deleted file mode 100644 index 0034da8ce6cd..000000000000 --- a/emulators/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c +++ /dev/null @@ -1,19 +0,0 @@ ---- src/io/prom/fs/hfsplus/unicode.c.DIST Thu May 6 10:45:32 2004 -+++ src/io/prom/fs/hfsplus/unicode.c Tue May 25 10:06:24 2004 -@@ -28,6 +28,16 @@ - - #include "unicode.h" - -+#ifdef FREEBSD_MB_SUPPORT -+size_t mbrtowc __P((wchar_t * __restrict, const char * __restrict, size_t, -+ mbstate_t * __restrict)); -+size_t wcrtomb __P((char * __restrict, wchar_t, mbstate_t * __restrict)); -+ -+#include "mbrtowc.c" -+#include "wcrtomb.c" -+#endif /* FREEBSD_MB_SUPPORT */ -+ -+ - /* convert the asci string astr into a unicode string given by ustr. - * - * ToDo: Think about better error handling ? diff --git a/emulators/pearpc/files/patch-src__io__prom__fs__hfsplus__unicode.c b/emulators/pearpc/files/patch-src__io__prom__fs__hfsplus__unicode.c new file mode 100644 index 000000000000..0034da8ce6cd --- /dev/null +++ b/emulators/pearpc/files/patch-src__io__prom__fs__hfsplus__unicode.c @@ -0,0 +1,19 @@ +--- src/io/prom/fs/hfsplus/unicode.c.DIST Thu May 6 10:45:32 2004 ++++ src/io/prom/fs/hfsplus/unicode.c Tue May 25 10:06:24 2004 +@@ -28,6 +28,16 @@ + + #include "unicode.h" + ++#ifdef FREEBSD_MB_SUPPORT ++size_t mbrtowc __P((wchar_t * __restrict, const char * __restrict, size_t, ++ mbstate_t * __restrict)); ++size_t wcrtomb __P((char * __restrict, wchar_t, mbstate_t * __restrict)); ++ ++#include "mbrtowc.c" ++#include "wcrtomb.c" ++#endif /* FREEBSD_MB_SUPPORT */ ++ ++ + /* convert the asci string astr into a unicode string given by ustr. + * + * ToDo: Think about better error handling ? diff --git a/emulators/raine/files/patch-source::alleg::blit.c b/emulators/raine/files/patch-source::alleg::blit.c deleted file mode 100644 index 1ecda275b4ff..000000000000 --- a/emulators/raine/files/patch-source::alleg::blit.c +++ /dev/null @@ -1,11 +0,0 @@ ---- source/alleg/blit.c.orig Mon Jan 17 12:37:21 2005 -+++ source/alleg/blit.c Mon Jan 17 12:38:10 2005 -@@ -1,1 +1,1 @@ - #ifdef RAINE_WIN32 - #include - #include -+#elif defined(RAINE_UNIX) -+#include - #endif - #include "blit_x2.h" - #include "eagle.h" diff --git a/emulators/raine/files/patch-source::emumain.c b/emulators/raine/files/patch-source::emumain.c deleted file mode 100644 index 3293c4321044..000000000000 --- a/emulators/raine/files/patch-source::emumain.c +++ /dev/null @@ -1,13 +0,0 @@ ---- source/emumain.c.orig Wed Aug 17 13:14:36 2005 -+++ source/emumain.c Thu Nov 17 18:04:37 2005 -@@ -9,1 +9,1 @@ - #include - #endif - -+#ifdef RAINE_UNIX -+#include -+#endif -+ - #include "raine.h" // General defines and stuff - #include "gui.h" // Interface stuff - #include "sasound.h" // Sound Sample stuff diff --git a/emulators/raine/files/patch-source::gui::rgui.c b/emulators/raine/files/patch-source::gui::rgui.c deleted file mode 100644 index 11576063bd5d..000000000000 --- a/emulators/raine/files/patch-source::gui::rgui.c +++ /dev/null @@ -1,13 +0,0 @@ ---- source/gui/rgui.c.orig Mon Jan 17 12:07:21 2005 -+++ source/gui/rgui.c Mon Jan 17 12:23:46 2005 -@@ -9,1 +9,1 @@ - #include - #endif - -+#ifdef RAINE_UNIX -+#include -+#endif -+ - #include "raine.h" - #include "rgui.h" - #include "rguiproc.h" diff --git a/emulators/raine/files/patch-source__alleg__blit.c b/emulators/raine/files/patch-source__alleg__blit.c new file mode 100644 index 000000000000..1ecda275b4ff --- /dev/null +++ b/emulators/raine/files/patch-source__alleg__blit.c @@ -0,0 +1,11 @@ +--- source/alleg/blit.c.orig Mon Jan 17 12:37:21 2005 ++++ source/alleg/blit.c Mon Jan 17 12:38:10 2005 +@@ -1,1 +1,1 @@ + #ifdef RAINE_WIN32 + #include + #include ++#elif defined(RAINE_UNIX) ++#include + #endif + #include "blit_x2.h" + #include "eagle.h" diff --git a/emulators/raine/files/patch-source__emumain.c b/emulators/raine/files/patch-source__emumain.c new file mode 100644 index 000000000000..3293c4321044 --- /dev/null +++ b/emulators/raine/files/patch-source__emumain.c @@ -0,0 +1,13 @@ +--- source/emumain.c.orig Wed Aug 17 13:14:36 2005 ++++ source/emumain.c Thu Nov 17 18:04:37 2005 +@@ -9,1 +9,1 @@ + #include + #endif + ++#ifdef RAINE_UNIX ++#include ++#endif ++ + #include "raine.h" // General defines and stuff + #include "gui.h" // Interface stuff + #include "sasound.h" // Sound Sample stuff diff --git a/emulators/raine/files/patch-source__gui__rgui.c b/emulators/raine/files/patch-source__gui__rgui.c new file mode 100644 index 000000000000..11576063bd5d --- /dev/null +++ b/emulators/raine/files/patch-source__gui__rgui.c @@ -0,0 +1,13 @@ +--- source/gui/rgui.c.orig Mon Jan 17 12:07:21 2005 ++++ source/gui/rgui.c Mon Jan 17 12:23:46 2005 +@@ -9,1 +9,1 @@ + #include + #endif + ++#ifdef RAINE_UNIX ++#include ++#endif ++ + #include "raine.h" + #include "rgui.h" + #include "rguiproc.h" -- cgit v1.2.3