From 878c4e383306fe797ed78839b4656ae5f4bafdaf Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 4 Feb 2016 20:56:22 +0100
Subject: [PATCH] Cleanup

---
 content.h            |  3 ++-
 core_options.h       |  6 ++++--
 database_info.h      |  2 ++
 dynamic.h            |  1 +
 libretro_version_1.h |  5 ++++-
 movie.h              | 11 ++++++-----
 net_http_special.h   |  3 ++-
 runloop.h            | 17 +++++++++++++++--
 8 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/content.h b/content.h
index 077ed2a166..9d35f82aba 100644
--- a/content.h
+++ b/content.h
@@ -17,12 +17,13 @@
 #ifndef __RARCH_FILE_H
 #define __RARCH_FILE_H
 
-#include <boolean.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <sys/types.h>
 
+#include <boolean.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/core_options.h b/core_options.h
index cd63f158ac..99a8ec3fb2 100644
--- a/core_options.h
+++ b/core_options.h
@@ -17,11 +17,13 @@
 #ifndef CORE_OPTIONS_H__
 #define CORE_OPTIONS_H__
 
-#include <boolean.h>
-#include "libretro.h"
 #include <stddef.h>
+
+#include <boolean.h>
 #include <string/string_list.h>
 
+#include "libretro.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/database_info.h b/database_info.h
index 2a6c3ec539..28d14ef4da 100644
--- a/database_info.h
+++ b/database_info.h
@@ -20,8 +20,10 @@
 
 #include <stdint.h>
 #include <stddef.h>
+
 #include <boolean.h>
 #include <file/file_archive.h>
+
 #include "libretro-db/libretrodb.h"
 
 #ifdef __cplusplus
diff --git a/dynamic.h b/dynamic.h
index 1de23d3e0c..63c153ab36 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -18,6 +18,7 @@
 #define __DYNAMIC_H
 
 #include <boolean.h>
+
 #include "libretro.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/libretro_version_1.h b/libretro_version_1.h
index edef835849..a16e642c27 100644
--- a/libretro_version_1.h
+++ b/libretro_version_1.h
@@ -29,10 +29,13 @@ extern "C" {
 
 enum
 {
-   /* Polling is performed before call to retro_run */
+   /* Polling is performed before 
+    * call to retro_run. */
    POLL_TYPE_EARLY = 0,
+
    /* Polling is performed when requested. */
    POLL_TYPE_NORMAL,
+
    /* Polling is performed on first call to 
     * retro_input_state per frame. */
    POLL_TYPE_LATE
diff --git a/movie.h b/movie.h
index 1f988cf0f1..1d3cbe3ab4 100644
--- a/movie.h
+++ b/movie.h
@@ -23,14 +23,15 @@ extern "C" {
 
 #include <stdint.h>
 #include <stddef.h>
+
 #include <boolean.h>
 
-#define BSV_MAGIC 0x42535631
+#define BSV_MAGIC          0x42535631
 
-#define MAGIC_INDEX 0
-#define SERIALIZER_INDEX 1
-#define CRC_INDEX 2
-#define STATE_SIZE_INDEX 3
+#define MAGIC_INDEX        0
+#define SERIALIZER_INDEX   1
+#define CRC_INDEX          2
+#define STATE_SIZE_INDEX   3
 
 typedef struct bsv_movie bsv_movie_t;
 
diff --git a/net_http_special.h b/net_http_special.h
index 244bf73747..c22e5f01f8 100644
--- a/net_http_special.h
+++ b/net_http_special.h
@@ -27,6 +27,7 @@ enum
    NET_HTTP_GET_TIMEOUT
 };
 
-int net_http_get(const char **result, size_t *size, const char *url, retro_time_t *timeout);
+int net_http_get(const char **result, size_t *size,
+      const char *url, retro_time_t *timeout);
 
 #endif
diff --git a/runloop.h b/runloop.h
index 32c500d368..55143692e0 100644
--- a/runloop.h
+++ b/runloop.h
@@ -81,23 +81,35 @@ enum runloop_ctl_state
    RUNLOOP_CTL_FRONTEND_KEY_EVENT_GET,
    RUNLOOP_CTL_KEY_EVENT_GET,
    RUNLOOP_CTL_DATA_DEINIT,
+
    /* Checks for state changes in this frame. */
    RUNLOOP_CTL_CHECK_STATE,
+
    RUNLOOP_CTL_CHECK_MOVIE,
+
    /* Checks if movie is being played. */
    RUNLOOP_CTL_CHECK_MOVIE_PLAYBACK,
+
    RUNLOOP_CTL_CHECK_MOVIE_INIT,
+
    /* Checks if movie is being recorded. */
    RUNLOOP_CTL_CHECK_MOVIE_RECORD,
-   /* Checks if slowmotion toggle/hold was being pressed and/or held. */
+
+   /* Checks if slowmotion toggle/hold 
+    * was being pressed and/or held. */
    RUNLOOP_CTL_CHECK_SLOWMOTION,
+
    RUNLOOP_CTL_CHECK_PAUSE_STATE,
+
    /* Initializes message queue. */
    RUNLOOP_CTL_MSG_QUEUE_INIT,
+
    /* Deinitializes message queue. */
    RUNLOOP_CTL_MSG_QUEUE_DEINIT,
+
    /* Initializes dummy core. */
    RUNLOOP_CTL_MSG_QUEUE_LOCK,
+
    RUNLOOP_CTL_MSG_QUEUE_UNLOCK,
    RUNLOOP_CTL_MSG_QUEUE_FREE,
    RUNLOOP_CTL_MSG_QUEUE_PULL,
@@ -303,7 +315,8 @@ global_t *global_get_ptr(void);
  * Returns: 0 on successful run, 
  * Returns 1 if we have to wait until button input in order 
  * to wake up the loop.
- * Returns -1 if we forcibly quit out of the RetroArch iteration loop. 
+ * Returns -1 if we forcibly quit out of the 
+ * RetroArch iteration loop. 
  **/
 int runloop_iterate(unsigned *sleep_ms);