From 7726cc65d55673c6a94eab4b130f68c585cbf2aa Mon Sep 17 00:00:00 2001 From: BearOso Date: Mon, 1 May 2023 15:29:39 -0500 Subject: [PATCH] Remove some unused, misplaced, or ancient code. --- external/glslang | 2 +- port.h | 12 ------------ snes9x.cpp | 7 +------ win32/render.cpp | 2 -- 4 files changed, 2 insertions(+), 21 deletions(-) diff --git a/external/glslang b/external/glslang index 6d41bb9c..9c7fd1a3 160000 --- a/external/glslang +++ b/external/glslang @@ -1 +1 @@ -Subproject commit 6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7 +Subproject commit 9c7fd1a33e5cecbe465e1cd70170167d5e40d398 diff --git a/port.h b/port.h index e1d2d67e..a6864a79 100644 --- a/port.h +++ b/port.h @@ -111,9 +111,6 @@ typedef size_t pint; #define FALSE 0 #endif -#define START_EXTERN_C extern "C" { -#define END_EXTERN_C } - #ifndef __WIN32__ #ifndef PATH_MAX #define PATH_MAX 1024 @@ -150,15 +147,6 @@ void SetInfoDlgColor(unsigned char, unsigned char, unsigned char); #define SLASH_CHAR '/' #endif -#ifndef SIG_PF -#define SIG_PF void (*) (int) -#endif - -#ifdef __linux -#define TITLE "Snes9x: Linux" -#define SYS_CONFIG_FILE "/etc/snes9x/snes9x.conf" -#endif - #ifndef TITLE #define TITLE "Snes9x" #endif diff --git a/snes9x.cpp b/snes9x.cpp index e50a5877..d4c757df 100644 --- a/snes9x.cpp +++ b/snes9x.cpp @@ -171,11 +171,6 @@ void S9xLoadConfigFiles (char **argv, int argc) if (!skip) { - #ifdef SYS_CONFIG_FILE - try_load_config_file(SYS_CONFIG_FILE, conf); - S9xParsePortConfig(conf, 0); - #endif - std::string fname; fname = S9xGetDirectory(DEFAULT_DIR); @@ -753,4 +748,4 @@ char * S9xParseArgs (char **argv, int argc) S9xVerifyControllers(); return (rom_filename); -} \ No newline at end of file +} diff --git a/win32/render.cpp b/win32/render.cpp index a750d222..5cf659c8 100644 --- a/win32/render.cpp +++ b/win32/render.cpp @@ -76,9 +76,7 @@ uint8 *ChangeLog [3] = { ChangeLog1, ChangeLog2, ChangeLog3 }; -START_EXTERN_C uint8 snes9x_clear_change_log = 0; -END_EXTERN_C enum BlarggMode { UNINITIALIZED,