Fix compilation with modern GCC, remove unused portaudio.h

7 files changed, 7 insertions, 10 deletions

diff --git a/shell/emu/main.h b/shell/emu/main.h
index 43688c3..8bf6c42 100644
--- a/shell/emu/main.h
+++ b/shell/emu/main.h
@@ -1,7 +1,6 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-int ResumeEmulation;
 // utility functions that the core requires us to implement
 extern const char* S9xGetFilename(const char* extension);
 extern const char* S9xGetDirectory(uint32_t dirtype);
diff --git a/shell/input/sdl/input.c b/shell/input/sdl/input.c
index 89034c0..158d7ef 100644
--- a/shell/input/sdl/input.c
+++ b/shell/input/sdl/input.c
@@ -1,7 +1,6 @@
 #include <SDL/SDL.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <portaudio.h>
 #include "main.h"
 #include "snes9x.h"
 #include "soundux.h"
@@ -67,7 +66,7 @@ uint32_t S9xReadJoypad(int32_t port)
 					break;
 				}
 			break;
-			case SDLK_KEYUP:
+			case SDL_KEYUP:
 				switch(event.key.keysym.sym)
 				{
 					case SDLK_HOME:
diff --git a/shell/other/compatibility_layer.c b/shell/other/compatibility_layer.c
index fea850b..27ffb5b 100644
--- a/shell/other/compatibility_layer.c
+++ b/shell/other/compatibility_layer.c
@@ -1,5 +1,4 @@
 #include <SDL/SDL.h>
-#include <portaudio.h>
 #include "main.h"
 #include "snes9x.h"
 #include "soundux.h"
diff --git a/source/apu.c b/source/apu.c
index eb6fcb6..2413450 100644
--- a/source/apu.c
+++ b/source/apu.c
@@ -32,7 +32,7 @@ void S9xDeinitAPU()
    }
 }
 
-uint8_t APUROM [64];
+extern uint8_t APUROM [64];
 
 void S9xResetAPU()
 {
diff --git a/source/apu.h b/source/apu.h
index 42d266f..4a6d46f 100644
--- a/source/apu.h
+++ b/source/apu.h
@@ -46,8 +46,8 @@ typedef struct
    bool     UNUSED2 [3];
 } SAPU;
 
-SAPU APU;
-SIAPU IAPU;
+extern SAPU APU;
+extern SIAPU IAPU;
 
 static INLINE void S9xAPUUnpackStatus(void)
 {
diff --git a/source/cpuops.c b/source/cpuops.c
index 129ffef..99373d0 100644
--- a/source/cpuops.c
+++ b/source/cpuops.c
@@ -18,7 +18,7 @@
 
 #include <retro_inline.h>
 
-int32_t OpAddress;
+extern int32_t OpAddress;
 
 /* ADC */
 static void Op69M1(void)
diff --git a/source/soundux.h b/source/soundux.h
index a3b4bbc..5cb4218 100644
--- a/source/soundux.h
+++ b/source/soundux.h
@@ -48,7 +48,7 @@ typedef struct
    bool     mute_sound;
 } SoundStatus;
 
-SoundStatus so;
+extern SoundStatus so;
 
 typedef struct
 {
@@ -105,7 +105,7 @@ typedef struct
    int32_t  noise_hertz;
 } SSoundData;
 
-SSoundData SoundData;
+extern SSoundData SoundData;
 
 void S9xSetSoundVolume(int32_t channel, int16_t volume_left, int16_t volume_right);
 void S9xSetSoundFrequency(int32_t channel, int32_t hertz);