From e58eee37bc1e8f5c57021b591ec2f1d1b3e98bce Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 28 Jun 2017 05:44:59 +0200
Subject: [PATCH] Cleanups

---
 audio/drivers/jack.c                    | 4 ----
 configuration.c                         | 1 -
 intl/msg_hash_es.c                      | 1 -
 intl/msg_hash_pt_pt.c                   | 1 -
 libretro-common/features/features_cpu.c | 1 +
 libretro-common/formats/bmp/rbmp.c      | 2 --
 libretro-common/lists/file_list.c       | 1 -
 retroarch.c                             | 2 --
 8 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/audio/drivers/jack.c b/audio/drivers/jack.c
index 1f509bd942..9b0758175f 100644
--- a/audio/drivers/jack.c
+++ b/audio/drivers/jack.c
@@ -18,14 +18,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <assert.h>
-
 #include <jack/jack.h>
 #include <jack/types.h>
 #include <jack/ringbuffer.h>
 
 #include <boolean.h>
-#include <retro_assert.h>
 #include <rthreads/rthreads.h>
 
 #include "../audio_driver.h"
@@ -76,7 +73,6 @@ static int process_cb(jack_nframes_t nframes, void *data)
       jack_nframes_t f;
       jack_default_audio_sample_t *out = (jack_default_audio_sample_t*)jack_port_get_buffer(jd->ports[i], nframes);
 
-      retro_assert(out);
       jack_ringbuffer_read(jd->buffer[i], (char*)out, min_avail * sizeof(jack_default_audio_sample_t));
 
       for (f = min_avail; f < nframes; f++)
diff --git a/configuration.c b/configuration.c
index 61c0e3c73b..655ce0306d 100644
--- a/configuration.c
+++ b/configuration.c
@@ -3130,7 +3130,6 @@ static void save_keybind_hat(config_file_t *conf, const char *key,
          break;
 
       default:
-         retro_assert(0);
          break;
    }
 
diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c
index d5a804242c..5f8ddab95a 100644
--- a/intl/msg_hash_es.c
+++ b/intl/msg_hash_es.c
@@ -17,7 +17,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <retro_assert.h>
 #include <compat/strl.h>
 #include <string/stdstring.h>
 
diff --git a/intl/msg_hash_pt_pt.c b/intl/msg_hash_pt_pt.c
index 4cee1d3487..0ab39d3033 100644
--- a/intl/msg_hash_pt_pt.c
+++ b/intl/msg_hash_pt_pt.c
@@ -17,7 +17,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <retro_assert.h>
 #include <compat/strl.h>
 #include <string/stdstring.h>
 
diff --git a/libretro-common/features/features_cpu.c b/libretro-common/features/features_cpu.c
index 86f12095c0..685c90c173 100644
--- a/libretro-common/features/features_cpu.c
+++ b/libretro-common/features/features_cpu.c
@@ -33,6 +33,7 @@
 #include <streams/file_stream.h>
 #include <libretro.h>
 #include <features/features_cpu.h>
+#include <retro_timers.h>
 
 #if defined(_WIN32) && !defined(_XBOX)
 #include <windows.h>
diff --git a/libretro-common/formats/bmp/rbmp.c b/libretro-common/formats/bmp/rbmp.c
index b31d12d30b..560fed3d93 100644
--- a/libretro-common/formats/bmp/rbmp.c
+++ b/libretro-common/formats/bmp/rbmp.c
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <retro_assert.h>
 #include <retro_inline.h>
 
 #include <formats/image.h>
@@ -334,7 +333,6 @@ static unsigned char *rbmp__bmp_load(rbmp__context *s, unsigned *x, unsigned *y,
       }
       else
       {
-         retro_assert(hsz == 108 || hsz == 124);
          mr = rbmp__get32le(s);
          mg = rbmp__get32le(s);
          mb = rbmp__get32le(s);
diff --git a/libretro-common/lists/file_list.c b/libretro-common/lists/file_list.c
index 0b178e42cf..9ad11a8805 100644
--- a/libretro-common/lists/file_list.c
+++ b/libretro-common/lists/file_list.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <retro_assert.h>
 #include <retro_common.h>
 #include <lists/file_list.h>
 #include <string/stdstring.h>
diff --git a/retroarch.c b/retroarch.c
index 8556a2d305..3ac3c50211 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -268,11 +268,9 @@ static void retroarch_msg_queue_init(void)
 {
    retroarch_msg_queue_deinit();
    runloop_msg_queue = msg_queue_new(8);
-   retro_assert(runloop_msg_queue);
 
 #ifdef HAVE_THREADS
    _runloop_msg_queue_lock = slock_new();
-   retro_assert(_runloop_msg_queue_lock);
 #endif
 }