Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Eric Sandall (90d9baecfd9df6260f58f7e7b18faea1c2c6c066)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Eric Sandall (90d9baecfd9df6260f58f7e7b18faea1c2c6c066)
  • Date: Sun, 5 Apr 2009 18:04:32 -0500

GIT changes to master games grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

games-emulators/zsnes/DETAILS | 2 +-
games-emulators/zsnes/HISTORY | 5 +++++
games-emulators/zsnes/gcc43.patch | 6 +++---
3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 90d9baecfd9df6260f58f7e7b18faea1c2c6c066
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

zsnes: Source tarball regenerated with some code cleanups
Updated gcc43.patch to the new constness change in main()

The changes between old and new tarballs are:
diff -Naur zsnes-old/zsnes_1_51/src/init.asm
zsnes-new/zsnes_1_51/src/init.asm
--- zsnes-old/zsnes_1_51/src/init.asm 2007-01-23 10:51:00.000000000
-0800
+++ zsnes-new/zsnes_1_51/src/init.asm 2007-10-30 20:17:17.000000000
-0700
@@ -892,7 +892,6 @@
SECTION .bss
NEWSYM IPSPatched, resb 1
NEWSYM Checksumvalue, resw 1
-NEWSYM CRC32, resd 1
NEWSYM SramExists, resb 1
NEWSYM NumofBanks, resd 1
NEWSYM NumofBytes, resd 1
diff -Naur zsnes-old/zsnes_1_51/src/initc.c
zsnes-new/zsnes_1_51/src/initc.c
--- zsnes-old/zsnes_1_51/src/initc.c 2007-01-19 16:02:24.000000000
-0800
+++ zsnes-new/zsnes_1_51/src/initc.c 2007-10-30 20:17:29.000000000
-0700
@@ -1649,9 +1649,9 @@
}
}

-extern unsigned int MsgCount, MessageOn, CRC32;
+extern unsigned int MsgCount, MessageOn;
extern char *Msgptr;
-unsigned int SPC7110Entries;
+unsigned int SPC7110Entries, CRC32;

void SPC7PackIndexLoad()
{
diff -Naur zsnes-old/zsnes_1_51/src/parsegen.cpp
zsnes-new/zsnes_1_51/src/parsegen.cpp
--- zsnes-old/zsnes_1_51/src/parsegen.cpp 2007-01-15 15:58:43.000000000
-0800
+++ zsnes-new/zsnes_1_51/src/parsegen.cpp 2007-10-30 21:30:26.000000000
-0700
@@ -43,22 +43,16 @@
#define __WIN32__
#endif

-#if defined(__MSDOS__) || defined(__WIN32__)
-#define SLASH_STR "\\"
-#else
-#define SLASH_STR "/"
-#endif
-
string gcc = "gcc";
string cflags;

#ifdef _MSC_VER //MSVC
-static inline string COMPILE_OBJ(string obj, string c)
+static inline string COMPILE_OBJ(const string& obj, const string& c)
{
return(string(string("cl /nologo /Fo")+obj+string(" ")+c));
}
#else
-static inline string COMPILE_OBJ(string obj, string c)
+static inline string COMPILE_OBJ(const string& obj, const string& c)
{
return(string(gcc+(" ")+cflags+(" -o ")+obj+string(" -c ")+c));
}
@@ -121,7 +115,7 @@
}

//This is like strtok(), except this understands quoted characters and
updates error locations
-char *get_token(char *str, char *delim)
+char *get_token(char *str, const char *delim)
{
static char *pos = 0;
char *token = 0;
@@ -339,7 +333,7 @@
return(true);
}

-string encode_string(string& str, bool quotes = true)
+string encode_string(const string& str, bool quotes = true)
{
string newstr("");
if (quotes) { newstr += '\"'; }
@@ -461,7 +455,7 @@
private:
config_data_array data_array;

- bool duplicate_name(string& name)
+ bool duplicate_name(const string& name)
{
if (find(data_array.begin(), data_array.end(), name) !=
data_array.end())
{
@@ -472,13 +466,13 @@
}

public:
- void add_comment(string comment)
+ void add_comment(const string& comment)
{
config_data_element new_element = { "", none, NT, 0, "", comment };
data_array.push_back(new_element);
}

- void add_var_single(string& name, ctype type, string dependancy,
string comment = "")
+ void add_var_single(const string& name, ctype type, const string&
dependancy, const string& comment = "")
{
if (!duplicate_name(name))
{
@@ -486,12 +480,12 @@
data_array.push_back(new_element);
}
}
- void add_var_single(string& name, const char *type, string
dependancy, string comment = "")
+ void add_var_single(const string& name, const char *type, const
string& dependancy, const string& comment = "")
{
add_var_single(name, GetCType(type), dependancy, comment);
}

- void add_var_quoted(string& name, string dependancy, string comment
= "")
+ void add_var_quoted(const string& name, const string& dependancy,
const string& comment = "")
{
if (!duplicate_name(name))
{
@@ -500,7 +494,7 @@
}
}

- void add_var_mult(string& name, ctype type, size_t length, string
dependancy, string comment = "")
+ void add_var_mult(const string& name, ctype type, size_t length,
const string& dependancy, const string& comment = "")
{
if (!duplicate_name(name))
{
@@ -508,12 +502,12 @@
data_array.push_back(new_element);
}
}
- void add_var_mult(string& name, const char *type, size_t length,
string dependancy, string comment = "")
+ void add_var_mult(const string& name, const char *type, size_t
length, const string& dependancy, const string& comment = "")
{
add_var_mult(name, GetCType(type), length, dependancy, comment);
}

- void add_var_packed(string& name, size_t length, string dependancy,
string comment = "")
+ void add_var_packed(const string& name, size_t length, const string&
dependancy, const string& comment = "")
{
if (!duplicate_name(name))
{
@@ -522,7 +516,7 @@
}
}

- void add_var_ptr(string& name, ctype type, size_t length, string
dependancy, string comment = "")
+ void add_var_ptr(const string& name, ctype type, size_t length,
const string& dependancy, const string& comment = "")
{
if (!duplicate_name(name))
{
@@ -530,7 +524,7 @@
data_array.push_back(new_element);
}
}
- void add_var_ptr(string& name, const char *type, size_t length,
string dependancy, string comment = "")
+ void add_var_ptr(const string& name, const char *type, size_t
length, const string& dependancy, const string& comment = "")
{
add_var_ptr(name, GetCType(type), length, dependancy, comment);
}
@@ -615,9 +609,9 @@
#define int_scale "*sizeof(int)"

//Convert asm types to C types
-char *convert_asm_type(const char *str, bool unsigned_var = true)
+const char *convert_asm_type(const char *str, bool unsigned_var = true)
{
- char *var_type = 0;
+ const char *var_type = 0;
if (!strcasecmp(str, "dd"))
{
var_type = "unsigned int";
@@ -655,7 +649,7 @@
return(var_type);
}

-void output_parser_start(ostream& c_stream, string& cheader_file)
+void output_parser_start(ostream& c_stream, const string& cheader_file)
{
c_stream << "/*\n"
<< "Config file handler generated by Nach's Config file
handler creator.\n"
@@ -1540,7 +1534,7 @@

#define CONFIG_COMMENT (config_comment ? config_comment : "")

-void parser_generate(istream& psr_stream, ostream& c_stream, ostream&
cheader_stream, string cheader_file = "")
+void parser_generate(istream& psr_stream, ostream& c_stream, ostream&
cheader_stream, const string& cheader_file = "")
{
current_location.line_number = current_location.column_number = 0;
ostringstream cvars(""), hvars("");
@@ -1549,8 +1543,8 @@
while (!psr_stream.eof())
{
char *token;
- char *parser_comment;
- char *config_comment;
+ const char *parser_comment;
+ const char *config_comment;

psr_stream.getline(line, LINE_LENGTH);
@@ -1584,7 +1578,7 @@
{
if ((*token == '#') || (*token == '%'))
{
- char *next_token = get_token(0, " ");
+ const char *next_token = get_token(0, " ");
handle_directive(token+1, next_token);

if (cheader_stream && (!next_token || strncasecmp(next_token,
"PSR_", strlen("PSR_"))))
@@ -1596,7 +1590,7 @@

string varname;
string dependancy;
- char *d;
+ const char *d;

if ((d = strchr(token, ':')))
{
@@ -1619,8 +1613,8 @@
if ((!is_array && !is_packed && !is_ptr) ||
((token = get_token(0, " ")) && (array =
enhanced_atoi(token)) && (token = get_token(0, " "))))
{
- char *asm_type = token;
- char *var_type = convert_asm_type(asm_type);
+ const char *asm_type = token;
+ const char *var_type = convert_asm_type(asm_type);

if (var_type)
{
@@ -1828,7 +1822,7 @@
}
}

-int main(size_t argc, const char **argv)
+int main(size_t argc, const char *const *const argv)
{
const char *cheader_file = 0;
bool compile = false;
@@ -1880,7 +1874,7 @@
<< "\n"
<< "Options:\n"
<< "\n"
- << " -Ddefine Define a processor director. Example:
-D__MSDOS__\n"
+ << " -Ddefine Define a processor director. Example:
-D__WIN32__\n"
<< " Can specify multiple defines.\n"
<< "\n"
<< " -cheader Create a C/C++ header with the following
name.\n"
diff -Naur zsnes-old/zsnes_1_51/src/tools/archopt.c
zsnes-new/zsnes_1_51/src/tools/archopt.c
--- zsnes-old/zsnes_1_51/src/tools/archopt.c 2006-12-28
21:50:31.000000000 -0800
+++ zsnes-new/zsnes_1_51/src/tools/archopt.c 2007-10-30
21:30:35.000000000 -0700
@@ -1,8 +1,30 @@
+/*
+Copyright (C) 2005-2007 Nach, grinvader ( http://www.zsnes.com )
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 2 as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>

+#ifdef _M_X64
+#define __x86_64__
+#endif
+
+#ifdef __GNUC__
#ifdef __x86_64__
#define cpuid(in, a, b, c, d) asm volatile("cpuid": "=a" (a), "=b" (b),
"=c" (c), "=d" (d) : "a" (in));
#else
@@ -13,6 +35,22 @@
movl %%ebx,%%edi;\
popl %%ebx": "=a" (a), "=D" (b), "=c" (c), "=d" (d) : "a" (in));
#endif
+#else
+char cpubuf[256];
+int z_in, z_a, z_b, z_c, z_d;
+void cpuid_run()
+{
+ _asm {
+ mov eax,z_in
+ cpuid
+ mov z_a,eax
+ mov z_b,ebx
+ mov z_c,ecx
+ mov z_d,edx
+ };
+}
+#define cpuid(in, a, b, c, d) z_in = in; cpuid_run(); a = z_a; b = z_b;
c = z_c; d = z_d;
+#endif

char *x86_flags[] =
{ "fpu", "vme", "de", "pse", "tsc",
"msr", "pae", "mce",
@@ -62,6 +100,7 @@
{
int have = 0x200000;
#ifndef __x86_64__
+ #ifdef __GNUC__
asm volatile
(
" pushfl;"
@@ -76,6 +115,23 @@
: "=a" (have)
: "c" (have)
);
+ #else
+ z_c = have;
+ _asm {
+ mov ecx,z_c
+ pushfd
+ pop eax
+ mov edx,eax
+ xor eax,ecx
+ push eax
+ popfd
+ pushfd
+ pop eax
+ xor eax,edx
+ mov z_a,eax
+ };
+ have = z_a;
+ #endif
#endif
return(have);
}
@@ -196,238 +252,268 @@
cpu = "native";
#endif
#endif
-
- if (!cpu && *cpu_family && *vendor_id)
+ if (!cpu)
{
- if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
+ if (!cpu && *cpu_family && *vendor_id)
{
- if (strstr(flags, " mmx "))
+ #ifdef __GNUC__
+ if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name,
"AMD"))
{
- #if __GNUC__ > 2
- if (strstr(flags, " 3dnow "))
+ if (strstr(flags, " mmx "))
{
- if (strstr(flags, " 3dnowext ") && (atoi(cpu_family) > 5))
+ #if __GNUC__ > 2
+ if (strstr(flags, " 3dnow "))
{
- #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
- if (strstr(flags, " sse "))
+ if (strstr(flags, " 3dnowext ") && (atoi(cpu_family) > 5))
{
- #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
- if (strstr(flags, " sse2 ") && strstr(flags, " lm "))
//Need two checks to protect Semprons
+ #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
+ if (strstr(flags, " sse "))
{
- if (strstr(model_name, "Opteron"))
- {
- cpu = "opteron";
- }
- else if (strstr(model_name, "Athlon(tm) 64")) //Also
athlon-fx
+ #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
+ if (strstr(flags, " sse2 ") && strstr(flags, " lm "))
//Need two checks to protect Semprons
{
- cpu = "athlon64";
+ if (strstr(model_name, "Opteron"))
+ {
+ cpu = "opteron";
+ }
+ else if (strstr(model_name, "Athlon(tm) 64")) //Also
athlon-fx
+ {
+ cpu = "athlon64";
+ }
+ else
+ {
+ cpu = "k8";
+ }
}
- else
+ #endif
+ if (!cpu)
{
- cpu = "k8";
+ if (strstr(model_name, "Athlon(tm) 4"))
+ {
+ cpu = "athlon-4";
+ }
+ else if (strstr(model_name, "Athlon(tm) MP"))
+ {
+ cpu = "athlon-mp";
+ }
+ else
+ {
+ cpu = "athlon-xp";
+ }
}
}
+
+ if (!cpu && (atoi(model) > 3))
+ {
+ cpu = "athlon-tbird";
+ }
#endif
+
if (!cpu)
{
- if (strstr(model_name, "Athlon(tm) 4"))
- {
- cpu = "athlon-4";
- }
- else if (strstr(model_name, "Athlon(tm) MP"))
- {
- cpu = "athlon-mp";
- }
- else
- {
- cpu = "athlon-xp";
- }
+ cpu = "athlon";
}
}

- if (!cpu && (atoi(model) > 3))
- {
- cpu = "athlon-tbird";
- }
- #endif
-
+ #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
if (!cpu)
{
- cpu = "athlon";
+ int model_num = atoi(model);
+ if ((model_num == 9) || (model_num >= 13))
+ {
+ cpu = "k6-3";
+ }
+ else
+ {
+ cpu = "k6-2";
+ }
}
+ #endif
}
+ #endif

- #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
if (!cpu)
{
- int model_num = atoi(model);
- if ((model_num == 9) || (model_num >= 13))
- {
- cpu = "k6-3";
- }
- else
- {
- cpu = "k6-2";
- }
+ cpu = "k6";
}
- #endif
- }
- #endif
-
- if (!cpu)
- {
- cpu = "k6";
}
}
- }
- else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name,
"Intel"))
- {
- #if __GNUC__ > 2
- if (strstr(flags, " mmx "))
+ else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name,
"Intel"))
{
- if (strstr(flags, " sse "))
+ #if __GNUC__ > 2
+ if (strstr(flags, " mmx "))
{
- if (strstr(flags, " sse2 "))
+ if (strstr(flags, " sse "))
{
- #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
- if (strstr(flags, " pni ") && strcmp(cpu_family, "6"))
+ if (strstr(flags, " sse2 "))
{
- if (strstr(flags, " lm "))
+ #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
+ if (strstr(flags, " pni ") && strcmp(cpu_family, "6"))
{
- cpu = "nocona";
+ if (strstr(flags, " lm "))
+ {
+ cpu = "nocona";
+ }
+ else
+ {
+ cpu = "prescott";
+ }
}
- else
+ #endif
+
+ if (!cpu)
{
- cpu = "prescott";
+ if (!strcmp(cpu_family, "6"))
+ {
+ #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
+ cpu = "pentium-m";
+ #else
+ cpu = "pentium3";
+ #endif
+ }
+ else
+ {
+ #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
+ if (strstr(model_name, "Mobile"))
+ {
+ cpu = "pentium4m";
+ }
+ #endif
+
+ if (!cpu)
+ {
+ cpu = "pentium4";
+ }
+ }
}
}
- #endif
-
- if (!cpu)
+ else
{
- if (!strcmp(cpu_family, "6"))
+ #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
+ if (strstr(model_name, "Mobile"))
{
- #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
- cpu = "pentium-m";
- #else
- cpu = "pentium3";
- #endif
+ cpu = "pentium3m";
}
- else
- {
- #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
- if (strstr(model_name, "Mobile"))
- {
- cpu = "pentium4m";
- }
- #endif
+ #endif

- if (!cpu)
- {
- cpu = "pentium4";
- }
+ if (!cpu)
+ {
+ cpu = "pentium3";
}
}
}
else
{
- #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
- if (strstr(model_name, "Mobile"))
+ if (!strcmp(cpu_family, "6"))
{
- cpu = "pentium3m";
+ cpu = "pentium2";
}
- #endif
-
- if (!cpu)
+ else
{
- cpu = "pentium3";
+ cpu = "pentium-mmx";
}
}
}
- else
+ #endif
+
+ if (!cpu)
+ {
+ int family = atoi(cpu_family);
+ if (family > 5)
+ {
+ cpu = "pentiumpro";
+ }
+ else if (family == 5)
+ {
+ cpu = "pentium";
+ }
+ }
+ }
+ #if __GNUC__ > 2
+ #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
+ else if (!strcmp(vendor_id, "CentaurHauls") && strstr(flags, " mmx
"))
+ {
+ if (strstr(flags, " 3dnow "))
{
- if (!strcmp(cpu_family, "6"))
+ if (atoi(cpu_family) > 5)
{
- cpu = "pentium2";
+ cpu = "c3";
}
else
{
- cpu = "pentium-mmx";
+ cpu = "winchip2";
}
}
+ #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
+ else if (strstr(flags, " sse "))
+ {
+ cpu = "c3-2";
+ }
+ #endif
+
+ if (!cpu)
+ {
+ cpu = "winchip-c6";
+ }
}
#endif
+ #endif

if (!cpu)
{
int family = atoi(cpu_family);
if (family > 5)
{
- cpu = "pentiumpro";
+ cpu = "i686";
}
else if (family == 5)
{
- cpu = "pentium";
+ cpu = "i586";
}
- }
- }
- #if __GNUC__ > 2
- #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
- else if (!strcmp(vendor_id, "CentaurHauls") && strstr(flags, " mmx
"))
- {
- if (strstr(flags, " 3dnow "))
- {
- if (atoi(cpu_family) > 5)
+ else if (family == 4)
{
- cpu = "c3";
+ cpu = "i486";
}
else
{
- cpu = "winchip2";
+ cpu = "i386";
}
}
- #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
+ #else //MSVC
+ cpu = cpubuf;
+ *cpu = 0;
+
+ if (strstr(flags, " sse2 "))
+ {
+ strcat(cpu, " /arch:SSE2");
+ }
else if (strstr(flags, " sse "))
{
- cpu = "c3-2";
+ strcat(cpu, " /arch:SSE");
}
- #endif

- if (!cpu)
+ #ifdef __x86_64__
+ if (strstr(flags, " lm ")) //64 bit
{
- cpu = "winchip-c6";
+ if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name,
"AMD"))
+ {
+ strcat(cpu, " /favor:AMD64");
+ }
+ else if (!strcmp(vendor_id, "GenuineIntel") ||
strstr(model_name, "Intel"))
+ {
+ strcat(cpu, " /favor:EM64T");
+ }
}
+ #endif
+ #endif
}
- #endif
- #endif
-
- if (!cpu)
+ else
{
- int family = atoi(cpu_family);
- if (family > 5)
- {
- cpu = "i686";
- }
- else if (family == 5)
- {
- cpu = "i586";
- }
- else if (family == 4)
- {
- cpu = "i486";
- }
- else
- {
- cpu = "i386";
- }
+ puts("Could not open /proc/cpuinfo, and CPUID instruction not
available.");
+ return(1);
}
- puts(cpu);
- }
- else
- {
- puts("Could not open /proc/cpuinfo, and CPUID instruction not
available.");
- return(1);
}
+ puts(cpu);

return(0);
}

diff --git a/games-emulators/zsnes/DETAILS b/games-emulators/zsnes/DETAILS
index 40cf293..c749bf6 100755
--- a/games-emulators/zsnes/DETAILS
+++ b/games-emulators/zsnes/DETAILS
@@ -16,7 +16,7 @@ else
SOURCE=${SPELL}${VERSION/./}src.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_${VERSION/\./_}
-
SOURCE_HASH=sha512:2cec9ad7762fc7a257c6b1d3e190b0ed53565dbafe42e1dee9eb182644392b7dd2c57faa846f63cd30ac079e5c05354d26ce0612d20481a1f54d760d62d95353
+
SOURCE_HASH=sha512:b10373cf81b201a33dc60c728431d4f69d36de31fcf6f137b623ea206a2998f722dcd6132daec1d0bf14a05ae52f3ee9ecee4334517039be554db85c9f7b8274
fi
WEB_SITE=http://zsnes.com/
ENTERED=20020312
diff --git a/games-emulators/zsnes/HISTORY b/games-emulators/zsnes/HISTORY
index bd51fad..e614cc6 100644
--- a/games-emulators/zsnes/HISTORY
+++ b/games-emulators/zsnes/HISTORY
@@ -1,3 +1,8 @@
+2009-04-05 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Source tarball was regenerated for some code cleanups
+ DOS->WIN32, some x86_64 cleanup, and constness changes
+ * gcc43.patch: Sync to new code changes
+
2008-04-12 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply gcc43.patch
Do not run ./configure via autogen.sh
diff --git a/games-emulators/zsnes/gcc43.patch
b/games-emulators/zsnes/gcc43.patch
index 095e68b..18fa08e 100644
--- a/games-emulators/zsnes/gcc43.patch
+++ b/games-emulators/zsnes/gcc43.patch
@@ -9,12 +9,12 @@ diff -Naur zsnes_1_51.orig/src/parsegen.cpp
zsnes_1_51/src/parsegen.cpp
#include <vector>
#include <algorithm>
#include <sstream>
-@@ -1828,7 +1829,7 @@
+@@ -1822,7 +1823,7 @@
}
}

--int main(size_t argc, const char **argv)
-+int main (int argc, const char **argv)
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
{
const char *cheader_file = 0;
bool compile = false;



  • [SM-Commit] GIT changes to master games grimoire by Eric Sandall (90d9baecfd9df6260f58f7e7b18faea1c2c6c066), Eric Sandall, 04/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page