Don't make asserts dependent on retro_log.h

2024-07-08 12:15:49 +00:00 · 2015-09-01 11:59:27 +02:00 · 2015-09-01 11:59:27 +02:00 · 15ba019ea1
commit 15ba019ea1
parent 7bcb3d4f27
19 changed files with 107 additions and 48 deletions
--- a/decompress/7zip_support.c
+++ b/decompress/7zip_support.c
@ -19,11 +19,13 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <sys/types.h>
-
 #include <string.h>
+
+#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <file/file_path.h>
 #include <string/string_list.h>
+
 #include "7zip_support.h"

 #include "../deps/7zip/7z.h"
--- a/decompress/zip_support.c
+++ b/decompress/zip_support.c
@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <string.h>

+#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <file/file_path.h>

--- a/file_ops.c
+++ b/file_ops.c
@ -14,21 +14,24 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "file_ops.h"
-#include <file/file_path.h>
 #include <stdlib.h>
 #include <boolean.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
+
 #include <compat/strl.h>
 #include <compat/posix_string.h>
+#include <retro_assert.h>
 #include <retro_miscellaneous.h>
-
+#include <file/file_path.h>
 #ifdef HAVE_COMPRESSION
 #include <file/file_extract.h>
 #endif

+#include "file_ops.h"
+
+
 #ifdef HAVE_7ZIP
 #include "decompress/7zip_support.h"
 #endif
--- 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 <file/file_path.h>
 #include <stdlib.h>
 #include <boolean.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
-#include <compat/strl.h>
-#include <compat/posix_string.h>
-#include <retro_miscellaneous.h>

 #ifdef __HAIKU__
 #include <kernel/image.h>
@ -73,6 +69,12 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif

+#include <file/file_path.h>
+#include <compat/strl.h>
+#include <compat/posix_string.h>
+#include <retro_assert.h>
+#include <retro_miscellaneous.h>
+
 void fill_pathname_expand_special(char *out_path,
      const char *in_path, size_t size)
 {
--- a/general.h
+++ b/general.h
@ -22,6 +22,7 @@
 #include <limits.h>
 #include <compat/strl.h>
 #include <retro_inline.h>
+#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include "configuration.h"
 #include "driver.h"
--- a/input/input_autodetect.h
+++ b/input/input_autodetect.h
@ -18,6 +18,8 @@
 #define _INPUT_AUTODETECT_H

 #include <stdint.h>
+
+#include <boolean.h>
 #include <retro_miscellaneous.h>

 typedef struct autoconfig_params
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@ -21,6 +21,7 @@

 #include <compat/posix_string.h>
 #include <file/file_path.h>
+#include <retro_assert.h>
 #include <string/string_list.h>
 #include <file/config_file.h>
 #include <formats/image.h>
--- 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 <file/config_file.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-#include <compat/strl.h>
-#include <compat/posix_string.h>
-#include <compat/msvc.h>
-#include <file/file_path.h>
-#include <retro_miscellaneous.h>
-#include <string/string_list.h>
-#include <rhash.h>

 #if !defined(_WIN32) && !defined(__CELLOS_LV2__) && !defined(_XBOX)
 #include <sys/param.h> /* PATH_MAX */
@ -43,8 +35,17 @@
 #include <xtl.h>
 #endif

-#define MAX_INCLUDE_DEPTH 16
+#include <file/config_file.h>
+#include <compat/strl.h>
+#include <compat/posix_string.h>
+#include <compat/msvc.h>
+#include <file/file_path.h>
+#include <retro_assert.h>
+#include <retro_miscellaneous.h>
+#include <string/string_list.h>
+#include <rhash.h>

+#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);
--- 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 <file/file_path.h>

 #include <stdlib.h>
 #include <boolean.h>
@ -28,26 +27,6 @@
 #include <time.h>
 #include <errno.h>

-#ifdef __HAIKU__
-#include <kernel/image.h>
-#endif
-
-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
-#include <unistd.h> /* stat() is defined here */
-#endif
-
-#include <compat/strl.h>
-#include <compat/posix_string.h>
-#include <retro_miscellaneous.h>
-
-#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 <pspkernel.h>
 #endif

+#ifdef __HAIKU__
+#include <kernel/image.h>
+#endif
+
+#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
+#include <unistd.h> /* stat() is defined here */
+#endif
+
+#include <file/file_path.h>
+
+#include <compat/strl.h>
+#include <compat/posix_string.h>
+#include <retro_assert.h>
+#include <retro_miscellaneous.h>
+
+#if defined(__CELLOS_LV2__)
+
+#ifndef S_ISDIR
+#define S_ISDIR(x) (x & 0040000)
+#endif
+
+#endif
+
+
 /**
 * path_get_extension:
 * @path               : path
--- a/libretro-common/include/retro_assert.h
+++ 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 <retro_log.h>
+#else
+#include <assert.h>
+#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
--- a/libretro-common/include/retro_miscellaneous.h
+++ b/libretro-common/include/retro_miscellaneous.h
@ -49,7 +49,6 @@
 #endif
 #include <compat/msvc.h>

-#include <retro_log.h>
 #include <retro_inline.h>
 #include <retro_endianness.h>
 #include <limits.h>
@ -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 <assert.h>
-#define rarch_assert(cond) assert(cond)
-#endif
-
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 #define RARCH_SCALE_BASE 256

--- a/libretro-common/string/string_list.c
+++ b/libretro-common/string/string_list.c
@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <string/string_list.h>
 #include <string.h>
+#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>
--- a/menu/cbs/menu_cbs_scan.c
+++ b/menu/cbs/menu_cbs_scan.c
@ -14,6 +14,8 @@
 */

 #include <file/file_path.h>
+#include <compat/strl.h>
+
 #include "../menu.h"
 #include "../menu_cbs.h"
 #include "../menu_entry.h"
--- a/menu/intl/menu_hash_es.c
+++ b/menu/intl/menu_hash_es.c
@ -16,6 +16,9 @@

 #include <stdint.h>
 #include <string.h>
+
+#include <retro_assert.h>
+
 #include "../../configuration.h"
 #include "../menu_hash.h"

--- a/menu/intl/menu_hash_pt.c
+++ b/menu/intl/menu_hash_pt.c
@ -17,6 +17,8 @@
 #include <stdint.h>
 #include <string.h>

+#include <retro_assert.h>
+
 #include "../menu_hash.h"
 #include "../../configuration.h"

--- a/menu/menu_shader.c
+++ b/menu/menu_shader.c
@ -17,6 +17,7 @@
 #include <string.h>

 #include <compat/strl.h>
+#include <retro_assert.h>
 #include <file/file_path.h>

 #include "menu.h"
--- a/msg_hash.c
+++ b/msg_hash.c
@ -14,6 +14,8 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <string.h>
+
 #include <rhash.h>

 #include "msg_hash.h"
--- a/runloop_msg.c
+++ b/runloop_msg.c
@ -16,6 +16,7 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <retro_assert.h>
 #include <queues/message_queue.h>
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
--- a/tasks/task_file_transfer.c
+++ b/tasks/task_file_transfer.c
@ -19,6 +19,7 @@
 #include <formats/image.h>
 #include <formats/rpng.h>
 #include <compat/strl.h>
+#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <queues/message_queue.h>
 #include <string/string_list.h>