From 15ba019ea1cfbbafb5df9c0226c96e32723be022 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 1 Sep 2015 11:59:27 +0200 Subject: [PATCH] Don't make asserts dependent on retro_log.h --- decompress/7zip_support.c | 4 +- decompress/zip_support.c | 1 + file_ops.c | 9 ++-- file_path_special.c | 10 +++-- general.h | 1 + input/input_autodetect.h | 2 + input/input_overlay.c | 1 + libretro-common/file/config_file.c | 19 ++++---- libretro-common/file/file_path.c | 45 ++++++++++--------- libretro-common/include/retro_assert.h | 40 +++++++++++++++++ libretro-common/include/retro_miscellaneous.h | 10 ----- libretro-common/string/string_list.c | 1 + menu/cbs/menu_cbs_scan.c | 2 + menu/intl/menu_hash_es.c | 3 ++ menu/intl/menu_hash_pt.c | 2 + menu/menu_shader.c | 1 + msg_hash.c | 2 + runloop_msg.c | 1 + tasks/task_file_transfer.c | 1 + 19 files changed, 107 insertions(+), 48 deletions(-) create mode 100644 libretro-common/include/retro_assert.h diff --git a/decompress/7zip_support.c b/decompress/7zip_support.c index 37c739b5e6..43dd987f12 100644 --- a/decompress/7zip_support.c +++ b/decompress/7zip_support.c @@ -19,11 +19,13 @@ #include #include #include - #include + +#include #include #include #include + #include "7zip_support.h" #include "../deps/7zip/7z.h" diff --git a/decompress/zip_support.c b/decompress/zip_support.c index f04d8fae16..44402dcf81 100644 --- a/decompress/zip_support.c +++ b/decompress/zip_support.c @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/file_ops.c b/file_ops.c index 148f3c6fc0..3e61219421 100644 --- a/file_ops.c +++ b/file_ops.c @@ -14,21 +14,24 @@ * If not, see . */ -#include "file_ops.h" -#include #include #include #include #include #include + #include #include +#include #include - +#include #ifdef HAVE_COMPRESSION #include #endif +#include "file_ops.h" + + #ifdef HAVE_7ZIP #include "decompress/7zip_support.h" #endif diff --git a/file_path_special.c b/file_path_special.c index b87474ca39..0d9b3309ed 100644 --- a/file_path_special.c +++ b/file_path_special.c @@ -20,15 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include #include #include #include #include -#include -#include -#include #ifdef __HAIKU__ #include @@ -73,6 +69,12 @@ #include #endif +#include +#include +#include +#include +#include + void fill_pathname_expand_special(char *out_path, const char *in_path, size_t size) { diff --git a/general.h b/general.h index 80650c274a..093d451fa5 100644 --- a/general.h +++ b/general.h @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "configuration.h" #include "driver.h" diff --git a/input/input_autodetect.h b/input/input_autodetect.h index 888ce59bef..5a1c758fa4 100644 --- a/input/input_autodetect.h +++ b/input/input_autodetect.h @@ -18,6 +18,8 @@ #define _INPUT_AUTODETECT_H #include + +#include #include typedef struct autoconfig_params diff --git a/input/input_overlay.c b/input/input_overlay.c index 6e8517f05a..eaa1830c9b 100644 --- a/input/input_overlay.c +++ b/input/input_overlay.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include diff --git a/libretro-common/file/config_file.c b/libretro-common/file/config_file.c index 768a984e3e..15de0353b0 100644 --- a/libretro-common/file/config_file.c +++ b/libretro-common/file/config_file.c @@ -20,19 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include #if !defined(_WIN32) && !defined(__CELLOS_LV2__) && !defined(_XBOX) #include /* PATH_MAX */ @@ -43,8 +35,17 @@ #include #endif -#define MAX_INCLUDE_DEPTH 16 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#define MAX_INCLUDE_DEPTH 16 static config_file_t *config_file_new_internal(const char *path, unsigned depth); void config_file_free(config_file_t *conf); diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c index 05539e9158..1a96cb8ba8 100644 --- a/libretro-common/file/file_path.c +++ b/libretro-common/file/file_path.c @@ -20,7 +20,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include #include @@ -28,26 +27,6 @@ #include #include -#ifdef __HAIKU__ -#include -#endif - -#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP) -#include /* stat() is defined here */ -#endif - -#include -#include -#include - -#if defined(__CELLOS_LV2__) - -#ifndef S_ISDIR -#define S_ISDIR(x) (x & 0040000) -#endif - -#endif - #if defined(_WIN32) #ifdef _MSC_VER #define setmode _setmode @@ -75,6 +54,30 @@ #include #endif +#ifdef __HAIKU__ +#include +#endif + +#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP) +#include /* stat() is defined here */ +#endif + +#include + +#include +#include +#include +#include + +#if defined(__CELLOS_LV2__) + +#ifndef S_ISDIR +#define S_ISDIR(x) (x & 0040000) +#endif + +#endif + + /** * path_get_extension: * @path : path diff --git a/libretro-common/include/retro_assert.h b/libretro-common/include/retro_assert.h new file mode 100644 index 0000000000..56996acd34 --- /dev/null +++ b/libretro-common/include/retro_assert.h @@ -0,0 +1,40 @@ +/* Copyright (C) 2010-2015 The RetroArch team + * + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (retro_assert.h). + * --------------------------------------------------------------------------------------- + * + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef __RETRO_ASSERT_H +#define __RETRO_ASSERT_H + +#ifdef RARCH_INTERNAL +#include +#else +#include +#endif + +#ifdef RARCH_INTERNAL +#define rarch_assert(cond) do { \ + if (!(cond)) { RARCH_ERR("Assertion failed at %s:%d.\n", __FILE__, __LINE__); abort(); } \ +} while(0) +#else +#define rarch_assert(cond) assert(cond) +#endif + +#endif diff --git a/libretro-common/include/retro_miscellaneous.h b/libretro-common/include/retro_miscellaneous.h index a2ea69f57c..e90fadaee9 100644 --- a/libretro-common/include/retro_miscellaneous.h +++ b/libretro-common/include/retro_miscellaneous.h @@ -49,7 +49,6 @@ #endif #include -#include #include #include #include @@ -66,15 +65,6 @@ #define min(a, b) ((a) < (b) ? (a) : (b)) #endif -#ifdef RARCH_INTERNAL -#define rarch_assert(cond) do { \ - if (!(cond)) { RARCH_ERR("Assertion failed at %s:%d.\n", __FILE__, __LINE__); abort(); } \ -} while(0) -#else -#include -#define rarch_assert(cond) assert(cond) -#endif - #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #define RARCH_SCALE_BASE 256 diff --git a/libretro-common/string/string_list.c b/libretro-common/string/string_list.c index bd892ec8b3..efe7145162 100644 --- a/libretro-common/string/string_list.c +++ b/libretro-common/string/string_list.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c index bdbe5fc296..edbc029b99 100644 --- a/menu/cbs/menu_cbs_scan.c +++ b/menu/cbs/menu_cbs_scan.c @@ -14,6 +14,8 @@ */ #include +#include + #include "../menu.h" #include "../menu_cbs.h" #include "../menu_entry.h" diff --git a/menu/intl/menu_hash_es.c b/menu/intl/menu_hash_es.c index fb30190674..e06b3a1ea2 100644 --- a/menu/intl/menu_hash_es.c +++ b/menu/intl/menu_hash_es.c @@ -16,6 +16,9 @@ #include #include + +#include + #include "../../configuration.h" #include "../menu_hash.h" diff --git a/menu/intl/menu_hash_pt.c b/menu/intl/menu_hash_pt.c index a7325c4b5c..573c1e242e 100644 --- a/menu/intl/menu_hash_pt.c +++ b/menu/intl/menu_hash_pt.c @@ -17,6 +17,8 @@ #include #include +#include + #include "../menu_hash.h" #include "../../configuration.h" diff --git a/menu/menu_shader.c b/menu/menu_shader.c index 5f7b1e2aee..92c39570b4 100644 --- a/menu/menu_shader.c +++ b/menu/menu_shader.c @@ -17,6 +17,7 @@ #include #include +#include #include #include "menu.h" diff --git a/msg_hash.c b/msg_hash.c index 8edcb2447d..6798ed0f17 100644 --- a/msg_hash.c +++ b/msg_hash.c @@ -14,6 +14,8 @@ * If not, see . */ +#include + #include #include "msg_hash.h" diff --git a/runloop_msg.c b/runloop_msg.c index e08c3c8eea..87906d18a8 100644 --- a/runloop_msg.c +++ b/runloop_msg.c @@ -16,6 +16,7 @@ * If not, see . */ +#include #include #ifdef HAVE_THREADS #include diff --git a/tasks/task_file_transfer.c b/tasks/task_file_transfer.c index 2384f7b434..a423677b26 100644 --- a/tasks/task_file_transfer.c +++ b/tasks/task_file_transfer.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include