Remove some unused, misplaced, or ancient code.
This commit is contained in:
parent
b2d92e86ac
commit
7726cc65d5
2
external/glslang
vendored
2
external/glslang
vendored
@ -1 +1 @@
|
||||
Subproject commit 6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7
|
||||
Subproject commit 9c7fd1a33e5cecbe465e1cd70170167d5e40d398
|
12
port.h
12
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
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user