Merge pull request #9 from conchurnavid/includes

Cleanup includes order and add missing includes

src/main.c

@@ -22,13 +22,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#include <SDL.h>
+#include <SDL_audio.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <SDL.h>
-#include <SDL_audio.h>
-
 #ifdef USE_SRC
 #include <samplerate.h>
 #endif
@@ -42,14 +42,13 @@
 #endif
 
 #define M64P_PLUGIN_PROTOTYPES 1
-#include "m64p_types.h"
-#include "m64p_plugin.h"
 #include "m64p_common.h"
 #include "m64p_config.h"
-
+#include "m64p_plugin.h"
+#include "m64p_types.h"
 #include "main.h"
-#include "volume.h"
 #include "osal_dynamiclib.h"
+#include "volume.h"
 
 /* Default start-time size of primary buffer (in equivalent output samples).
    This is the buffer where audio is loaded after it's extracted from n64's memory.

src/main.h

@@ -20,6 +20,8 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* version info */
+#include "m64p_config.h"
+
 #define SDL_AUDIO_PLUGIN_VERSION 0x020000
 #define AUDIO_PLUGIN_API_VERSION 0x020000
 #define CONFIG_API_VERSION       0x020100

src/osal_dynamiclib_unix.c

@@ -19,9 +19,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "m64p_types.h"
 #include "osal_dynamiclib.h"

src/osal_dynamiclib_win32.c

@@ -19,9 +19,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <windows.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
 
 #include "m64p_types.h"
 #include "osal_dynamiclib.h"

src/volume.c

@@ -22,15 +22,15 @@
 
 #if defined(HAS_OSS_SUPPORT)
 
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <sys/ioctl.h>
 /* Sound volume functions. */
 #include <sys/soundcard.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
+#include <sys/types.h>
 #include <unistd.h> /* close() */
-#include <fcntl.h>
-#include <stdio.h>
-#include <errno.h>
 
 #include "volume.h"