diff options
| author | SND\dario86_cp <SND\dario86_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-02-19 02:15:18 +0000 |
|---|---|---|
| committer | SND\dario86_cp <SND\dario86_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-02-19 02:15:18 +0000 |
| commit | 79c267cda79b52cff2ce83397af87aac64d049d7 (patch) | |
| tree | 43f49fa80e13ee9303d5472f0176c5062fc2e5dc | |
| parent | 12ddb091ed0a98ef323f2ee9e743386f570a4325 (diff) | |
| download | pcsxr-79c267cda79b52cff2ce83397af87aac64d049d7.tar.gz | |
Updated Free Software Foundation address (Jem256).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@75156 e17a0e51-4ae3-4d35-97c3-1a29b211df97
170 files changed, 326 insertions, 326 deletions
@@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c index 380b8e61..dec82daf 100644 --- a/gui/AboutDlg.c +++ b/gui/AboutDlg.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "Linux.h"
@@ -85,7 +85,7 @@ void RunAboutDialog(void) { "\n"
"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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.");
+ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.");
AboutDlg = gtk_about_dialog_new();
gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(AboutDlg), "PCSX-Reloaded");
diff --git a/gui/AboutDlg.h b/gui/AboutDlg.h index e8b82aff..f5001985 100644 --- a/gui/AboutDlg.h +++ b/gui/AboutDlg.h @@ -13,7 +13,7 @@ * * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef ABOUTDLG_H diff --git a/gui/Cheat.c b/gui/Cheat.c index 89e2c0fa..ac8ceeb3 100644 --- a/gui/Cheat.c +++ b/gui/Cheat.c @@ -13,7 +13,7 @@ * * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <stdio.h> diff --git a/gui/Cheat.h b/gui/Cheat.h index f0990af1..10bcc45d 100644 --- a/gui/Cheat.h +++ b/gui/Cheat.h @@ -13,7 +13,7 @@ * * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef GUI_CHEAT_H diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c index b4265fd2..7dfdbf4e 100644 --- a/gui/ConfDlg.c +++ b/gui/ConfDlg.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stdio.h>
diff --git a/gui/ConfDlg.h b/gui/ConfDlg.h index 56afc28c..22ea0263 100644 --- a/gui/ConfDlg.h +++ b/gui/ConfDlg.h @@ -13,7 +13,7 @@ * * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef CONFDLG_H diff --git a/gui/Config.c b/gui/Config.c index 86038729..d59c728e 100644 --- a/gui/Config.c +++ b/gui/Config.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stdio.h>
diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c index d9437a9a..f035ab8b 100644 --- a/gui/DebugMemory.c +++ b/gui/DebugMemory.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "Linux.h"
diff --git a/gui/DebugMemory.h b/gui/DebugMemory.h index f9451589..e1a2d264 100644 --- a/gui/DebugMemory.h +++ b/gui/DebugMemory.h @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef DEBUGMEMORY_H
diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c index 4c38d3da..86b08fe4 100644 --- a/gui/Gtk2Gui.c +++ b/gui/Gtk2Gui.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stdio.h>
diff --git a/gui/Linux.h b/gui/Linux.h index 352a0f72..281ba082 100644 --- a/gui/Linux.h +++ b/gui/Linux.h @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __LINUX_H__
diff --git a/gui/LnxMain.c b/gui/LnxMain.c index 4209cbbd..0165ae0f 100644 --- a/gui/LnxMain.c +++ b/gui/LnxMain.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "config.h"
diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c index 6f8f3404..e844857f 100644 --- a/gui/MemcardDlg.c +++ b/gui/MemcardDlg.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stdio.h>
diff --git a/gui/MemcardDlg.h b/gui/MemcardDlg.h index 137cd3fb..346daeab 100644 --- a/gui/MemcardDlg.h +++ b/gui/MemcardDlg.h @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef MEMCARDDLG_H
diff --git a/gui/Plugin.c b/gui/Plugin.c index 1ce533aa..e1bc9884 100644 --- a/gui/Plugin.c +++ b/gui/Plugin.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stdio.h>
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 03baad3f..78f00bfb 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -15,7 +15,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#include "psxcommon.h"
diff --git a/libpcsxcore/cdriso.h b/libpcsxcore/cdriso.h index 4fa81cbc..8c35445d 100644 --- a/libpcsxcore/cdriso.h +++ b/libpcsxcore/cdriso.h @@ -15,7 +15,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#ifndef CDRISO_H
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index d1605804..7b699248 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h index 7432ab03..512c3216 100644 --- a/libpcsxcore/cdrom.h +++ b/libpcsxcore/cdrom.h @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#ifndef __CDROM_H__
diff --git a/libpcsxcore/cheat.c b/libpcsxcore/cheat.c index 21d88b8e..befaa39a 100644 --- a/libpcsxcore/cheat.c +++ b/libpcsxcore/cheat.c @@ -13,7 +13,7 @@ * * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "psxcommon.h" diff --git a/libpcsxcore/cheat.h b/libpcsxcore/cheat.h index d54f22c3..3668d972 100644 --- a/libpcsxcore/cheat.h +++ b/libpcsxcore/cheat.h @@ -13,7 +13,7 @@ * * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef CHEAT_H diff --git a/libpcsxcore/debug.h b/libpcsxcore/debug.h index fc906a8e..0551a7f9 100644 --- a/libpcsxcore/debug.h +++ b/libpcsxcore/debug.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __DEBUG_H__ diff --git a/libpcsxcore/decode_xa.c b/libpcsxcore/decode_xa.c index 9198659e..96f7c958 100644 --- a/libpcsxcore/decode_xa.c +++ b/libpcsxcore/decode_xa.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/decode_xa.h b/libpcsxcore/decode_xa.h index a5994e12..b9e9d325 100644 --- a/libpcsxcore/decode_xa.h +++ b/libpcsxcore/decode_xa.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __DECODE_XA_H__ diff --git a/libpcsxcore/disr3000a.c b/libpcsxcore/disr3000a.c index d99fe982..28bbdc53 100644 --- a/libpcsxcore/disr3000a.c +++ b/libpcsxcore/disr3000a.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/gpu.c b/libpcsxcore/gpu.c index 05137541..9ade94ad 100644 --- a/libpcsxcore/gpu.c +++ b/libpcsxcore/gpu.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "psxhw.h"
diff --git a/libpcsxcore/gte.c b/libpcsxcore/gte.c index a27bd0f3..1ce8fecf 100644 --- a/libpcsxcore/gte.c +++ b/libpcsxcore/gte.c @@ -16,7 +16,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ /* @@ -219,7 +219,7 @@ static inline float flimE(float result) { #define F(a) BOUNDS((a), 0x7fffffff, (1 << 31) | (1 << 16), -(s64)0x80000000, (1 << 31) | (1 << 15)) #define limG1(a) LIM((a), 0x3ff, -0x400, (1 << 31) | (1 << 14)) #define limG2(a) LIM((a), 0x3ff, -0x400, (1 << 31) | (1 << 13)) -#define limH(a) LIM((a), 0x1000, 0x0000, (1 << 12))
+#define limH(a) LIM((a), 0x1000, 0x0000, (1 << 12)) #define limG1_ia(a) LIM((a), 0x3ffffff, -0x4000000, (1 << 31) | (1 << 14)) #define limG2_ia(a) LIM((a), 0x3ffffff, -0x4000000, (1 << 31) | (1 << 13)) @@ -278,53 +278,53 @@ static inline void MTC2(u32 value, int reg) { case 30: { -#if 1
- int a;
- gteLZCS = value;
-
- // non-MAME code
- a = gteLZCS;
- if (a > 0) {
- int i;
- for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--);
- gteLZCR = 31 - i;
- } else if (a < 0) {
- int i;
- a ^= 0xffffffff;
- for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--);
- gteLZCR = 31 - i;
- } else {
- gteLZCR = 32;
- }
-#else
- // MAME
- u32 lzcs = value;
- u32 lzcr = 0;
-
- gteLZCS = value;
-
- if( ( lzcs & 0x80000000 ) == 0 )
- {
- lzcs = ~lzcs;
- }
- while( ( lzcs & 0x80000000 ) != 0 )
- {
- lzcr++;
- lzcs <<= 1;
- }
- gteLZCR = lzcr;
-#endif
+#if 1 + int a; + gteLZCS = value; + + // non-MAME code + a = gteLZCS; + if (a > 0) { + int i; + for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--); + gteLZCR = 31 - i; + } else if (a < 0) { + int i; + a ^= 0xffffffff; + for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--); + gteLZCR = 31 - i; + } else { + gteLZCR = 32; + } +#else + // MAME + u32 lzcs = value; + u32 lzcr = 0; + + gteLZCS = value; + + if( ( lzcs & 0x80000000 ) == 0 ) + { + lzcs = ~lzcs; + } + while( ( lzcs & 0x80000000 ) != 0 ) + { + lzcr++; + lzcs <<= 1; + } + gteLZCR = lzcr; +#endif } break; -#if 1
- case 31:
- return;
-#else
- case 31:
- value = psxRegs.CP2D.r[reg];
- break;
-#endif
+#if 1 + case 31: + return; +#else + case 31: + value = psxRegs.CP2D.r[reg]; + break; +#endif default: psxRegs.CP2D.r[reg] = value; @@ -521,9 +521,9 @@ void gteSQR() { gteMAC1 = A1((gteIR1 * gteIR1) >> shift); gteMAC2 = A2((gteIR2 * gteIR2) >> shift); gteMAC3 = A3((gteIR3 * gteIR3) >> shift); - gteIR1 = limB1(gteMAC1, lm);
- gteIR2 = limB2(gteMAC2, lm);
- gteIR3 = limB3(gteMAC3, lm);
+ gteIR1 = limB1(gteMAC1, lm); + gteIR2 = limB2(gteMAC2, lm); + gteIR3 = limB3(gteMAC3, lm); } void gteNCCS() { diff --git a/libpcsxcore/gte.h b/libpcsxcore/gte.h index 2cea0264..4d008bb1 100644 --- a/libpcsxcore/gte.h +++ b/libpcsxcore/gte.h @@ -16,7 +16,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __GTE_H__ diff --git a/libpcsxcore/ix86/iGte.h b/libpcsxcore/ix86/iGte.h index d03705ec..421aa32c 100644 --- a/libpcsxcore/ix86/iGte.h +++ b/libpcsxcore/ix86/iGte.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __IGTE_H__ diff --git a/libpcsxcore/ix86/iR3000A.c b/libpcsxcore/ix86/iR3000A.c index 7fe10b40..f1d74648 100644 --- a/libpcsxcore/ix86/iR3000A.c +++ b/libpcsxcore/ix86/iR3000A.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/ix86/ix86.c b/libpcsxcore/ix86/ix86.c index 3f8903ec..ef615820 100644 --- a/libpcsxcore/ix86/ix86.c +++ b/libpcsxcore/ix86/ix86.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/ix86/ix86.h b/libpcsxcore/ix86/ix86.h index 2b60dfff..816c6a1e 100644 --- a/libpcsxcore/ix86/ix86.h +++ b/libpcsxcore/ix86/ix86.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ /* diff --git a/libpcsxcore/ix86_64/iGte.h b/libpcsxcore/ix86_64/iGte.h index bcb2f4be..d288f54f 100644 --- a/libpcsxcore/ix86_64/iGte.h +++ b/libpcsxcore/ix86_64/iGte.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __IGTE_H__ diff --git a/libpcsxcore/ix86_64/iR3000A-64.c b/libpcsxcore/ix86_64/iR3000A-64.c index 8b3cfa6a..10dfd1ab 100644 --- a/libpcsxcore/ix86_64/iR3000A-64.c +++ b/libpcsxcore/ix86_64/iR3000A-64.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/ix86_64/ix86_cpudetect.c b/libpcsxcore/ix86_64/ix86_cpudetect.c index 664e6b7d..dfbde264 100644 --- a/libpcsxcore/ix86_64/ix86_cpudetect.c +++ b/libpcsxcore/ix86_64/ix86_cpudetect.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifdef __x86_64__
@@ -292,7 +292,7 @@ void cpudetectInit( void ) switch( cpuinfo.x86Model )
{
case 4:
- case 8: // 0.25 µm
+ case 8: // 0.25 �m
strcpy( cpuinfo.x86Fam, "Intel Pentium (MMX)");
break;
default:
@@ -308,7 +308,7 @@ void cpudetectInit( void ) break;
case 2: // 66 MHz FSB
- case 5: // Xeon/Celeron (0.25 µm)
+ case 5: // Xeon/Celeron (0.25 �m)
case 6: // Internal L2 cache
strcpy( cpuinfo.x86Fam, "Intel Pentium II" );
break;
@@ -432,7 +432,7 @@ void cpudetectInit( void ) break;
case 6:
- case 7: // (0.25 µm)
+ case 7: // (0.25 �m)
case 8: // K6-2
case 9: // K6-III
case 14: // K6-2+ / K6-III+
diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c index f8fa31b7..58d3c1e4 100644 --- a/libpcsxcore/mdec.c +++ b/libpcsxcore/mdec.c @@ -15,7 +15,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#include "mdec.h"
diff --git a/libpcsxcore/mdec.h b/libpcsxcore/mdec.h index e191b4e5..b804d672 100644 --- a/libpcsxcore/mdec.h +++ b/libpcsxcore/mdec.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __MDEC_H__ diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c index 90e8d0fa..1de0aff8 100644 --- a/libpcsxcore/misc.c +++ b/libpcsxcore/misc.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/misc.h b/libpcsxcore/misc.h index ae3fc81f..626cf5c5 100644 --- a/libpcsxcore/misc.h +++ b/libpcsxcore/misc.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __MISC_H__ diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c index 9db5421b..c8c01b8b 100644 --- a/libpcsxcore/plugins.c +++ b/libpcsxcore/plugins.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h index bf55e65f..3247c752 100644 --- a/libpcsxcore/plugins.h +++ b/libpcsxcore/plugins.h @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#ifndef __PLUGINS_H__
diff --git a/libpcsxcore/ppc/pGte.h b/libpcsxcore/ppc/pGte.h index a968460b..51b4db45 100644 --- a/libpcsxcore/ppc/pGte.h +++ b/libpcsxcore/ppc/pGte.h @@ -13,7 +13,7 @@ * * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PGET_H diff --git a/libpcsxcore/ppc/pR3000A.c b/libpcsxcore/ppc/pR3000A.c index 3d3bfc8b..4b890880 100644 --- a/libpcsxcore/ppc/pR3000A.c +++ b/libpcsxcore/ppc/pR3000A.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if defined (__ppc__) || defined (__ppc64__) || defined (__powerpc__) || defined (__powerpc64__) || defined (__POWERPC__)
diff --git a/libpcsxcore/ppf.c b/libpcsxcore/ppf.c index e5ccdfc3..a5caca5f 100644 --- a/libpcsxcore/ppf.c +++ b/libpcsxcore/ppf.c @@ -17,7 +17,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "psxcommon.h"
diff --git a/libpcsxcore/ppf.h b/libpcsxcore/ppf.h index a8adecbb..4bd11b99 100644 --- a/libpcsxcore/ppf.h +++ b/libpcsxcore/ppf.h @@ -13,7 +13,7 @@ * * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __PPF_H__ diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c index 4be32620..88afba26 100644 --- a/libpcsxcore/psxbios.c +++ b/libpcsxcore/psxbios.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxbios.h b/libpcsxcore/psxbios.h index 3038319c..a5630b19 100644 --- a/libpcsxcore/psxbios.h +++ b/libpcsxcore/psxbios.h @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#ifndef __PSXBIOS_H__
diff --git a/libpcsxcore/psxcommon.c b/libpcsxcore/psxcommon.c index f118c2db..959b9a7d 100644 --- a/libpcsxcore/psxcommon.c +++ b/libpcsxcore/psxcommon.c @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #include "psxcommon.h" diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h index 78be8dba..dbedc429 100644 --- a/libpcsxcore/psxcommon.h +++ b/libpcsxcore/psxcommon.h @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index 8ecb629f..d573d446 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxcounters.h b/libpcsxcore/psxcounters.h index bccb2e4d..013fdbf4 100644 --- a/libpcsxcore/psxcounters.h +++ b/libpcsxcore/psxcounters.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __PSXCOUNTERS_H__ diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c index 88eb7fa8..c6bc6eb0 100644 --- a/libpcsxcore/psxdma.c +++ b/libpcsxcore/psxdma.c @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ /* @@ -48,8 +48,8 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU break; } SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2); -
- // Jungle Book - 0-0.333x DMA
+ + // Jungle Book - 0-0.333x DMA SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 3); return; @@ -67,14 +67,14 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU size = (bcr >> 16) * (bcr & 0xffff) * 2; SPU_readDMAMem(ptr, size); psxCpu->Clear(madr, size); -
-#if 1
- SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2);
-#else
- // Experimental burst dma transfer (0.333x max)
- SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 3);
-#endif
- return;
+ +#if 1 + SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2); +#else + // Experimental burst dma transfer (0.333x max) + SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 3); +#endif + return; #ifdef PSXDMA_LOG default: @@ -87,8 +87,8 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU DMA_INTERRUPT(4); } -
-void psxDma6(u32 madr, u32 bcr, u32 chcr) {
+ +void psxDma6(u32 madr, u32 bcr, u32 chcr) { u32 size; u32 *mem = (u32 *)PSXM(madr); @@ -106,22 +106,22 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) { return; } - // already 32-bit size
- size = bcr;
-
+ // already 32-bit size + size = bcr; + while (bcr--) { *mem-- = SWAP32((madr - 4) & 0xffffff); madr -= 4; } mem++; *mem = 0xffffff; -
-#if 1
- GPUOTCDMA_INT( size );
-#else
- // Experimental burst dma transfer (0.333x max)
- GPUOTCDMA_INT( size/3 );
-#endif
- return;
+ +#if 1 + GPUOTCDMA_INT( size ); +#else + // Experimental burst dma transfer (0.333x max) + GPUOTCDMA_INT( size/3 ); +#endif + return; } #ifdef PSXDMA_LOG else { @@ -133,9 +133,9 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) { HW_DMA6_CHCR &= SWAP32(~0x01000000); DMA_INTERRUPT(6); } -
-void gpuotcInterrupt()
-{
- HW_DMA6_CHCR &= SWAP32(~0x01000000);
- DMA_INTERRUPT(6);
-}
+ +void gpuotcInterrupt() +{ + HW_DMA6_CHCR &= SWAP32(~0x01000000); + DMA_INTERRUPT(6); +} diff --git a/libpcsxcore/psxdma.h b/libpcsxcore/psxdma.h index 63618ada..fdd5cf99 100644 --- a/libpcsxcore/psxdma.h +++ b/libpcsxcore/psxdma.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __PSXDMA_H__ @@ -47,35 +47,35 @@ extern "C" { psxRegs.intCycle[PSXINT_MDECOUTDMA].sCycle = psxRegs.cycle; \ } -#define MDECINDMA_INT(eCycle) { \
- psxRegs.interrupt |= (1 << PSXINT_MDECINDMA); \
- psxRegs.intCycle[PSXINT_MDECINDMA].cycle = eCycle; \
- psxRegs.intCycle[PSXINT_MDECINDMA].sCycle = psxRegs.cycle; \
-}
-
-#define GPUOTCDMA_INT(eCycle) { \
- psxRegs.interrupt |= (1 << PSXINT_GPUOTCDMA); \
- psxRegs.intCycle[PSXINT_GPUOTCDMA].cycle = eCycle; \
- psxRegs.intCycle[PSXINT_GPUOTCDMA].sCycle = psxRegs.cycle; \
-}
-
-#define CDRDMA_INT(eCycle) { \
- psxRegs.interrupt |= (1 << PSXINT_CDRDMA); \
- psxRegs.intCycle[PSXINT_CDRDMA].cycle = eCycle; \
- psxRegs.intCycle[PSXINT_CDRDMA].sCycle = psxRegs.cycle; \
-}
-
-/*
-DMA5 = N/A (PIO)
-*/
+#define MDECINDMA_INT(eCycle) { \ + psxRegs.interrupt |= (1 << PSXINT_MDECINDMA); \ + psxRegs.intCycle[PSXINT_MDECINDMA].cycle = eCycle; \ + psxRegs.intCycle[PSXINT_MDECINDMA].sCycle = psxRegs.cycle; \ +} + +#define GPUOTCDMA_INT(eCycle) { \ + psxRegs.interrupt |= (1 << PSXINT_GPUOTCDMA); \ + psxRegs.intCycle[PSXINT_GPUOTCDMA].cycle = eCycle; \ + psxRegs.intCycle[PSXINT_GPUOTCDMA].sCycle = psxRegs.cycle; \ +} + +#define CDRDMA_INT(eCycle) { \ + psxRegs.interrupt |= (1 << PSXINT_CDRDMA); \ + psxRegs.intCycle[PSXINT_CDRDMA].cycle = eCycle; \ + psxRegs.intCycle[PSXINT_CDRDMA].sCycle = psxRegs.cycle; \ +} + +/* +DMA5 = N/A (PIO) +*/ void psxDma3(u32 madr, u32 bcr, u32 chcr); void psxDma4(u32 madr, u32 bcr, u32 chcr); void psxDma6(u32 madr, u32 bcr, u32 chcr); void spuInterrupt(); -void mdec0Interrupt();
-void gpuotcInterrupt();
-void cdrDmaInterrupt();
+void mdec0Interrupt(); +void gpuotcInterrupt(); +void cdrDmaInterrupt(); #ifdef __cplusplus } diff --git a/libpcsxcore/psxhle.c b/libpcsxcore/psxhle.c index 83362ecd..9d1d0529 100644 --- a/libpcsxcore/psxhle.c +++ b/libpcsxcore/psxhle.c @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ /* diff --git a/libpcsxcore/psxhle.h b/libpcsxcore/psxhle.h index eef78e80..6eae3415 100644 --- a/libpcsxcore/psxhle.h +++ b/libpcsxcore/psxhle.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __PSXHLE_H__ diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c index 77e1fd02..a33bae08 100644 --- a/libpcsxcore/psxhw.c +++ b/libpcsxcore/psxhw.c @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ /* diff --git a/libpcsxcore/psxhw.h b/libpcsxcore/psxhw.h index cd4e928c..eaae45b1 100644 --- a/libpcsxcore/psxhw.h +++ b/libpcsxcore/psxhw.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __PSXHW_H__ diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c index b2954b4c..6b0d3e4c 100644 --- a/libpcsxcore/psxinterpreter.c +++ b/libpcsxcore/psxinterpreter.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c index 6e615cfe..14e27305 100644 --- a/libpcsxcore/psxmem.c +++ b/libpcsxcore/psxmem.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/psxmem.h b/libpcsxcore/psxmem.h index 7efad2b4..24bc9e38 100644 --- a/libpcsxcore/psxmem.h +++ b/libpcsxcore/psxmem.h @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#ifndef __PSXMEMORY_H__
diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c index 9a37abe6..c7a2b09a 100644 --- a/libpcsxcore/r3000a.c +++ b/libpcsxcore/r3000a.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h index b34a30f2..c927d05a 100644 --- a/libpcsxcore/r3000a.h +++ b/libpcsxcore/r3000a.h @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#ifndef __R3000A_H__
diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c index f4bb97e7..0dd01b39 100644 --- a/libpcsxcore/sio.c +++ b/libpcsxcore/sio.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
/*
diff --git a/libpcsxcore/sio.h b/libpcsxcore/sio.h index cc8d925b..2514162b 100644 --- a/libpcsxcore/sio.h +++ b/libpcsxcore/sio.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ diff --git a/libpcsxcore/spu.c b/libpcsxcore/spu.c index a60c0478..89d4b712 100644 --- a/libpcsxcore/spu.c +++ b/libpcsxcore/spu.c @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ /* diff --git a/libpcsxcore/spu.h b/libpcsxcore/spu.h index 85010cbd..92160e3c 100644 --- a/libpcsxcore/spu.h +++ b/libpcsxcore/spu.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __SPU_H__ diff --git a/libpcsxcore/system.h b/libpcsxcore/system.h index c869fdf1..a67c3a76 100644 --- a/libpcsxcore/system.h +++ b/libpcsxcore/system.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef __SYSTEM_H__ diff --git a/macosx/Plugin.c b/macosx/Plugin.c index ff5b1c88..02951613 100644 --- a/macosx/Plugin.c +++ b/macosx/Plugin.c @@ -13,7 +13,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #import <CoreFoundation/CoreFoundation.h> diff --git a/macosx/plugins/Common/SDL/include/SDL.h b/macosx/plugins/Common/SDL/include/SDL.h index 098521e1..51cb038b 100644 --- a/macosx/plugins/Common/SDL/include/SDL.h +++ b/macosx/plugins/Common/SDL/include/SDL.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/SDL_audio.h b/macosx/plugins/Common/SDL/include/SDL_audio.h index fc55c521..5e087755 100644 --- a/macosx/plugins/Common/SDL/include/SDL_audio.h +++ b/macosx/plugins/Common/SDL/include/SDL_audio.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/SDL_config.h b/macosx/plugins/Common/SDL/include/SDL_config.h index 990166c2..428c3c1a 100644 --- a/macosx/plugins/Common/SDL/include/SDL_config.h +++ b/macosx/plugins/Common/SDL/include/SDL_config.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/SDL_endian.h b/macosx/plugins/Common/SDL/include/SDL_endian.h index de69e32d..c6646a95 100644 --- a/macosx/plugins/Common/SDL/include/SDL_endian.h +++ b/macosx/plugins/Common/SDL/include/SDL_endian.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/SDL_error.h b/macosx/plugins/Common/SDL/include/SDL_error.h index a4a90d0e..bd6b64ac 100644 --- a/macosx/plugins/Common/SDL/include/SDL_error.h +++ b/macosx/plugins/Common/SDL/include/SDL_error.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/SDL_joystick.h b/macosx/plugins/Common/SDL/include/SDL_joystick.h index 2e70862f..25976577 100644 --- a/macosx/plugins/Common/SDL/include/SDL_joystick.h +++ b/macosx/plugins/Common/SDL/include/SDL_joystick.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/SDL_main.h b/macosx/plugins/Common/SDL/include/SDL_main.h index 803aa0fb..daa69c68 100644 --- a/macosx/plugins/Common/SDL/include/SDL_main.h +++ b/macosx/plugins/Common/SDL/include/SDL_main.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/SDL_mutex.h b/macosx/plugins/Common/SDL/include/SDL_mutex.h index e066f944..39569bcf 100644 --- a/macosx/plugins/Common/SDL/include/SDL_mutex.h +++ b/macosx/plugins/Common/SDL/include/SDL_mutex.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/SDL_platform.h b/macosx/plugins/Common/SDL/include/SDL_platform.h index f9429bde..c872229a 100644 --- a/macosx/plugins/Common/SDL/include/SDL_platform.h +++ b/macosx/plugins/Common/SDL/include/SDL_platform.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/SDL_rwops.h b/macosx/plugins/Common/SDL/include/SDL_rwops.h index b4dfa81f..3e2f130a 100644 --- a/macosx/plugins/Common/SDL/include/SDL_rwops.h +++ b/macosx/plugins/Common/SDL/include/SDL_rwops.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/SDL_stdinc.h b/macosx/plugins/Common/SDL/include/SDL_stdinc.h index ba1e5b5b..7289829c 100644 --- a/macosx/plugins/Common/SDL/include/SDL_stdinc.h +++ b/macosx/plugins/Common/SDL/include/SDL_stdinc.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/SDL_thread.h b/macosx/plugins/Common/SDL/include/SDL_thread.h index 1c8a76a2..cf3de29c 100644 --- a/macosx/plugins/Common/SDL/include/SDL_thread.h +++ b/macosx/plugins/Common/SDL/include/SDL_thread.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/begin_code.h b/macosx/plugins/Common/SDL/include/begin_code.h index 395dc7c6..83e25d01 100644 --- a/macosx/plugins/Common/SDL/include/begin_code.h +++ b/macosx/plugins/Common/SDL/include/begin_code.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/include/close_code.h b/macosx/plugins/Common/SDL/include/close_code.h index 4b4e8a49..c2c4dbd0 100644 --- a/macosx/plugins/Common/SDL/include/close_code.h +++ b/macosx/plugins/Common/SDL/include/close_code.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/SDL.c b/macosx/plugins/Common/SDL/src/SDL.c index 8347ef8a..005fb245 100644 --- a/macosx/plugins/Common/SDL/src/SDL.c +++ b/macosx/plugins/Common/SDL/src/SDL.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/SDL_error.c b/macosx/plugins/Common/SDL/src/SDL_error.c index 55d183a5..b50f2e56 100644 --- a/macosx/plugins/Common/SDL/src/SDL_error.c +++ b/macosx/plugins/Common/SDL/src/SDL_error.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/SDL_error_c.h b/macosx/plugins/Common/SDL/src/SDL_error_c.h index 54501f5f..0e8093e6 100644 --- a/macosx/plugins/Common/SDL/src/SDL_error_c.h +++ b/macosx/plugins/Common/SDL/src/SDL_error_c.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/audio/SDL_audio.c b/macosx/plugins/Common/SDL/src/audio/SDL_audio.c index bd0a5430..1aac56df 100644 --- a/macosx/plugins/Common/SDL/src/audio/SDL_audio.c +++ b/macosx/plugins/Common/SDL/src/audio/SDL_audio.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/audio/SDL_audio_c.h b/macosx/plugins/Common/SDL/src/audio/SDL_audio_c.h index df88025f..b85b4a5b 100644 --- a/macosx/plugins/Common/SDL/src/audio/SDL_audio_c.h +++ b/macosx/plugins/Common/SDL/src/audio/SDL_audio_c.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/audio/SDL_audiocvt.c b/macosx/plugins/Common/SDL/src/audio/SDL_audiocvt.c index 3af35f13..e8568e1d 100644 --- a/macosx/plugins/Common/SDL/src/audio/SDL_audiocvt.c +++ b/macosx/plugins/Common/SDL/src/audio/SDL_audiocvt.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/audio/SDL_audiomem.h b/macosx/plugins/Common/SDL/src/audio/SDL_audiomem.h index a539259e..41eb9379 100644 --- a/macosx/plugins/Common/SDL/src/audio/SDL_audiomem.h +++ b/macosx/plugins/Common/SDL/src/audio/SDL_audiomem.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/audio/SDL_audiotypecvt.c b/macosx/plugins/Common/SDL/src/audio/SDL_audiotypecvt.c index 30f26152..4b2d06d9 100644 --- a/macosx/plugins/Common/SDL/src/audio/SDL_audiotypecvt.c +++ b/macosx/plugins/Common/SDL/src/audio/SDL_audiotypecvt.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/audio/SDL_mixer.c b/macosx/plugins/Common/SDL/src/audio/SDL_mixer.c index 63a4b5c3..04a6f2b1 100644 --- a/macosx/plugins/Common/SDL/src/audio/SDL_mixer.c +++ b/macosx/plugins/Common/SDL/src/audio/SDL_mixer.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/audio/SDL_sysaudio.h b/macosx/plugins/Common/SDL/src/audio/SDL_sysaudio.h index 329e417b..5e4795f3 100644 --- a/macosx/plugins/Common/SDL/src/audio/SDL_sysaudio.h +++ b/macosx/plugins/Common/SDL/src/audio/SDL_sysaudio.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/audio/SDL_wave.c b/macosx/plugins/Common/SDL/src/audio/SDL_wave.c index d770e6ff..0f395c56 100644 --- a/macosx/plugins/Common/SDL/src/audio/SDL_wave.c +++ b/macosx/plugins/Common/SDL/src/audio/SDL_wave.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/audio/SDL_wave.h b/macosx/plugins/Common/SDL/src/audio/SDL_wave.h index 3c1f1234..3ecea82e 100644 --- a/macosx/plugins/Common/SDL/src/audio/SDL_wave.h +++ b/macosx/plugins/Common/SDL/src/audio/SDL_wave.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.c b/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.c index 0185e94f..1e18ba44 100644 --- a/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.c +++ b/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.h b/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.h index fe374381..3ad7ee9f 100644 --- a/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.h +++ b/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/file/SDL_rwops.c b/macosx/plugins/Common/SDL/src/file/SDL_rwops.c index 636361ca..cdc0b393 100644 --- a/macosx/plugins/Common/SDL/src/file/SDL_rwops.c +++ b/macosx/plugins/Common/SDL/src/file/SDL_rwops.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/joystick/SDL_joystick.c b/macosx/plugins/Common/SDL/src/joystick/SDL_joystick.c index 189b8117..a34744a1 100644 --- a/macosx/plugins/Common/SDL/src/joystick/SDL_joystick.c +++ b/macosx/plugins/Common/SDL/src/joystick/SDL_joystick.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/joystick/SDL_joystick_c.h b/macosx/plugins/Common/SDL/src/joystick/SDL_joystick_c.h index e0f8529e..802de97a 100644 --- a/macosx/plugins/Common/SDL/src/joystick/SDL_joystick_c.h +++ b/macosx/plugins/Common/SDL/src/joystick/SDL_joystick_c.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/joystick/SDL_sysjoystick.h b/macosx/plugins/Common/SDL/src/joystick/SDL_sysjoystick.h index ddb3b84f..c4601572 100644 --- a/macosx/plugins/Common/SDL/src/joystick/SDL_sysjoystick.h +++ b/macosx/plugins/Common/SDL/src/joystick/SDL_sysjoystick.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/joystick/darwin/SDL_sysjoystick.c b/macosx/plugins/Common/SDL/src/joystick/darwin/SDL_sysjoystick.c index 824917f2..d4a442c2 100644 --- a/macosx/plugins/Common/SDL/src/joystick/darwin/SDL_sysjoystick.c +++ b/macosx/plugins/Common/SDL/src/joystick/darwin/SDL_sysjoystick.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org @@ -149,7 +149,7 @@ HIDCreateOpenDeviceInterface(io_object_t hidDevice, recDevice * pDevice) &(pDevice->interface)); if (S_OK != plugInResult) HIDReportErrorNum - ("CouldnÕt query HID class device interface from plugInInterface", + ("Couldn�t query HID class device interface from plugInInterface", plugInResult); (*ppPlugInInterface)->Release(ppPlugInInterface); } else diff --git a/macosx/plugins/Common/SDL/src/joystick/darwin/SDL_sysjoystick_c.h b/macosx/plugins/Common/SDL/src/joystick/darwin/SDL_sysjoystick_c.h index d413f336..3f4a5ad8 100644 --- a/macosx/plugins/Common/SDL/src/joystick/darwin/SDL_sysjoystick_c.h +++ b/macosx/plugins/Common/SDL/src/joystick/darwin/SDL_sysjoystick_c.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/thread/SDL_systhread.h b/macosx/plugins/Common/SDL/src/thread/SDL_systhread.h index 584f20db..bfd6a91f 100644 --- a/macosx/plugins/Common/SDL/src/thread/SDL_systhread.h +++ b/macosx/plugins/Common/SDL/src/thread/SDL_systhread.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/thread/SDL_thread.c b/macosx/plugins/Common/SDL/src/thread/SDL_thread.c index 4d43a8e1..918b7708 100644 --- a/macosx/plugins/Common/SDL/src/thread/SDL_thread.c +++ b/macosx/plugins/Common/SDL/src/thread/SDL_thread.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/thread/SDL_thread_c.h b/macosx/plugins/Common/SDL/src/thread/SDL_thread_c.h index 4b670580..a92aa1ee 100644 --- a/macosx/plugins/Common/SDL/src/thread/SDL_thread_c.h +++ b/macosx/plugins/Common/SDL/src/thread/SDL_thread_c.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_syscond.c b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_syscond.c index 547daa71..dd4d991b 100644 --- a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_syscond.c +++ b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_syscond.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_sysmutex.c b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_sysmutex.c index 701c7f60..d06d948f 100644 --- a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_sysmutex.c +++ b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_sysmutex.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_sysmutex_c.h b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_sysmutex_c.h index e28b1190..bc1e2429 100644 --- a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_sysmutex_c.h +++ b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_sysmutex_c.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_syssem.c b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_syssem.c index adc38a65..a8abf1fa 100644 --- a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_syssem.c +++ b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_syssem.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_systhread.c b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_systhread.c index c4f694fb..5a46e709 100644 --- a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_systhread.c +++ b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_systhread.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_systhread_c.h b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_systhread_c.h index 8da81da1..a26fcbab 100644 --- a/macosx/plugins/Common/SDL/src/thread/pthread/SDL_systhread_c.h +++ b/macosx/plugins/Common/SDL/src/thread/pthread/SDL_systhread_c.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org diff --git a/plugins/bladesio1/settings.c b/plugins/bladesio1/settings.c index 40e5e43b..91459da2 100644 --- a/plugins/bladesio1/settings.c +++ b/plugins/bladesio1/settings.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#include <stdio.h>
diff --git a/plugins/bladesio1/settings.h b/plugins/bladesio1/settings.h index a08f110c..c78c1a1b 100644 --- a/plugins/bladesio1/settings.h +++ b/plugins/bladesio1/settings.h @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifndef _SETTINGS_H_ diff --git a/plugins/bladesio1/sio1.c b/plugins/bladesio1/sio1.c index 39ea98cc..669451ff 100644 --- a/plugins/bladesio1/sio1.c +++ b/plugins/bladesio1/sio1.c @@ -14,7 +14,7 @@ * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #include <stdio.h> diff --git a/plugins/bladesio1/sio1.h b/plugins/bladesio1/sio1.h index f4c8a0ef..2e27733c 100644 --- a/plugins/bladesio1/sio1.h +++ b/plugins/bladesio1/sio1.h @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#ifndef _SIO1_H_
diff --git a/plugins/dfsound/openal.c b/plugins/dfsound/openal.c index 05076b4d..d4a5d964 100755 --- a/plugins/dfsound/openal.c +++ b/plugins/dfsound/openal.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#include "stdafx.h"
diff --git a/plugins/dfsound/sdl.c b/plugins/dfsound/sdl.c index 5f80a1ff..fa0b4b97 100644 --- a/plugins/dfsound/sdl.c +++ b/plugins/dfsound/sdl.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "stdafx.h"
diff --git a/plugins/gxvideo/cfg.c b/plugins/gxvideo/cfg.c index b64bd99d..603e3a0e 100644 --- a/plugins/gxvideo/cfg.c +++ b/plugins/gxvideo/cfg.c @@ -14,8 +14,8 @@ *
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
*/
#include <sys/stat.h>
diff --git a/plugins/gxvideo/cfg.h b/plugins/gxvideo/cfg.h index 1e1c456c..c34cfc6d 100644 --- a/plugins/gxvideo/cfg.h +++ b/plugins/gxvideo/cfg.h @@ -14,8 +14,8 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. */ #ifndef _GPU_CFG_H_ @@ -43,8 +43,8 @@ typedef struct { void ReadConfig(void); void WriteConfig(void); void ReadWinSizeConfig(void); -
-void SoftDlgProc(void);
-void AboutDlgProc(void);
+ +void SoftDlgProc(void); +void AboutDlgProc(void); #endif diff --git a/plugins/gxvideo/draw.c b/plugins/gxvideo/draw.c index 5e3b31ad..6c176975 100644 --- a/plugins/gxvideo/draw.c +++ b/plugins/gxvideo/draw.c @@ -14,8 +14,8 @@ *
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
*/
#include <stdio.h>
diff --git a/plugins/gxvideo/draw.h b/plugins/gxvideo/draw.h index 6ab89518..fdca82b6 100644 --- a/plugins/gxvideo/draw.h +++ b/plugins/gxvideo/draw.h @@ -14,8 +14,8 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. */ #ifndef _GPU_DRAW_H_ diff --git a/plugins/gxvideo/fps.c b/plugins/gxvideo/fps.c index 3603dad1..5dc262c1 100644 --- a/plugins/gxvideo/fps.c +++ b/plugins/gxvideo/fps.c @@ -14,8 +14,8 @@ *
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
*/
#include <unistd.h>
diff --git a/plugins/gxvideo/fps.h b/plugins/gxvideo/fps.h index c1aec335..e35337c3 100644 --- a/plugins/gxvideo/fps.h +++ b/plugins/gxvideo/fps.h @@ -14,8 +14,8 @@ *
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
*/
#ifndef _FPS_INTERNALS_H
diff --git a/plugins/gxvideo/globals.c b/plugins/gxvideo/globals.c index 1ad6b142..7987c84f 100644 --- a/plugins/gxvideo/globals.c +++ b/plugins/gxvideo/globals.c @@ -14,8 +14,8 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. */ #include "globals.h" diff --git a/plugins/gxvideo/globals.h b/plugins/gxvideo/globals.h index 299548c7..d53e4b0a 100644 --- a/plugins/gxvideo/globals.h +++ b/plugins/gxvideo/globals.h @@ -14,8 +14,8 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. */ #ifndef GLOBALS_H_ diff --git a/plugins/gxvideo/gpu.c b/plugins/gxvideo/gpu.c index 853c7da3..1d1eb219 100644 --- a/plugins/gxvideo/gpu.c +++ b/plugins/gxvideo/gpu.c @@ -14,8 +14,8 @@ *
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
*/
#include "config.h"
diff --git a/plugins/gxvideo/gpu_utils.h b/plugins/gxvideo/gpu_utils.h index 471cc9a5..b9d00d0f 100644 --- a/plugins/gxvideo/gpu_utils.h +++ b/plugins/gxvideo/gpu_utils.h @@ -14,8 +14,8 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. */ #ifndef GPU_UTILS_H_ diff --git a/plugins/gxvideo/gpucfg/main.c b/plugins/gxvideo/gpucfg/main.c index d3d4f93d..44342dfe 100644 --- a/plugins/gxvideo/gpucfg/main.c +++ b/plugins/gxvideo/gpucfg/main.c @@ -13,8 +13,8 @@ *
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
*/
#include <gtk/gtk.h>
diff --git a/plugins/peopsxgl/gte_accuracy.c b/plugins/peopsxgl/gte_accuracy.c index 3af37ab0..9a1b7ed6 100644 --- a/plugins/peopsxgl/gte_accuracy.c +++ b/plugins/peopsxgl/gte_accuracy.c @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#include "stdafx.h"
diff --git a/plugins/peopsxgl/gte_accuracy.h b/plugins/peopsxgl/gte_accuracy.h index 6f42f21c..0d35ed1f 100644 --- a/plugins/peopsxgl/gte_accuracy.h +++ b/plugins/peopsxgl/gte_accuracy.h @@ -14,7 +14,7 @@ * 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#ifndef _GTE_ACCURACY_H_
diff --git a/po/fr_FR.po b/po/fr_FR.po index 3440315a..243741b4 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -516,7 +516,7 @@ msgid "" "\n" "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., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA." +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." msgstr "" #: ../gui/AboutDlg.c:100 diff --git a/po/hu_HU.po b/po/hu_HU.po index fa6ddf05..61eaa385 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -516,7 +516,7 @@ msgid "" "\n" "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., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA." +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." msgstr "" "Ez a program szabad szoftver; terjeszthetÅ‘ illetve módosÃtható a Free " "Software Foundation által kiadott GNU General Public License dokumentumában " @@ -529,8 +529,8 @@ msgstr "" "\n" "A felhasználónak a programmal együtt meg kell kapnia a GNU General Public " "License egy példányát; ha mégsem kapta meg, akkor Ãrjon a következÅ‘ cÃmre: " -"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " -"02111-1307 USA." +"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA" +"02110-1301 USA." #: ../gui/AboutDlg.c:100 msgid "translator-credits" @@ -516,7 +516,7 @@ msgid "" "\n" "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., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA." +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." msgstr "" "This program is free software; you can redistribute it\n" "and/or modify it under the terms of the GNU General\n" diff --git a/po/pcsxr.pot b/po/pcsxr.pot index dfafe8a3..51cdb7ac 100644 --- a/po/pcsxr.pot +++ b/po/pcsxr.pot @@ -496,7 +496,7 @@ msgid "" "\n" "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., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA." +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." msgstr "" #: ../gui/AboutDlg.c:100 diff --git a/po/pt_BR.po b/po/pt_BR.po index d06db741..bbf6e267 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -515,7 +515,7 @@ msgid "" "\n" "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., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA." +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." msgstr "" "This program is free software; you can redistribute it\n" "and/or modify it under the terms of the GNU General\n" diff --git a/po/ru_RU.po b/po/ru_RU.po index 35731720..7c51190e 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -511,7 +511,7 @@ msgid "" "\n" "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., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA." +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." msgstr "" #: ../gui/AboutDlg.c:100 diff --git a/po/zh_CN.po b/po/zh_CN.po index 9c499e72..b66ca9b1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -517,7 +517,7 @@ msgid "" "\n" "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., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA." +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." msgstr "" "This program is free software; you can redistribute it and/or modify it " "under the terms of the GNU General Public License as published by the Free " @@ -531,7 +531,7 @@ msgstr "" "\n" "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., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA." +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." #: ../gui/AboutDlg.c:100 msgid "translator-credits" diff --git a/po/zh_TW.po b/po/zh_TW.po index b12cce21..e2f62703 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -517,7 +517,7 @@ msgid "" "\n" "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., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA." +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." msgstr "" "This program is free software; you can redistribute it and/or modify it " "under the terms of the GNU General Public License as published by the Free " @@ -531,7 +531,7 @@ msgstr "" "\n" "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., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA." +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." #: ../gui/AboutDlg.c:100 msgid "translator-credits" diff --git a/win32/gui/AboutDlg.c b/win32/gui/AboutDlg.c index ca688d8b..f73a3618 100644 --- a/win32/gui/AboutDlg.c +++ b/win32/gui/AboutDlg.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <windows.h>
diff --git a/win32/gui/AboutDlg.h b/win32/gui/AboutDlg.h index a6fb136c..0ccc8c43 100644 --- a/win32/gui/AboutDlg.h +++ b/win32/gui/AboutDlg.h @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _PCSX_ABOUTDLG_H_
diff --git a/win32/gui/CheatDlg.c b/win32/gui/CheatDlg.c index 5dcb9394..cb6231f5 100644 --- a/win32/gui/CheatDlg.c +++ b/win32/gui/CheatDlg.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <windows.h>
diff --git a/win32/gui/ConfigurePlugins.c b/win32/gui/ConfigurePlugins.c index 687a6bbc..faa0f69c 100644 --- a/win32/gui/ConfigurePlugins.c +++ b/win32/gui/ConfigurePlugins.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <windows.h>
diff --git a/win32/gui/Win32.h b/win32/gui/Win32.h index ad9cfea3..d16a391b 100644 --- a/win32/gui/Win32.h +++ b/win32/gui/Win32.h @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __WIN32_H__
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c index 77e83a90..924a0de8 100644 --- a/win32/gui/WndMain.c +++ b/win32/gui/WndMain.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <windows.h>
diff --git a/win32/gui/plugin.c b/win32/gui/plugin.c index de930234..b22ff012 100644 --- a/win32/gui/plugin.c +++ b/win32/gui/plugin.c @@ -13,7 +13,7 @@ *
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <windows.h>
diff --git a/win32/gui/plugin.h b/win32/gui/plugin.h index 048dc3eb..9cef38fd 100644 --- a/win32/gui/plugin.h +++ b/win32/gui/plugin.h @@ -13,7 +13,7 @@ * * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ // Windows Specific Plugin Functions diff --git a/win32/intl/bindtextdom.c b/win32/intl/bindtextdom.c index 67b5742d..045b86c0 100644 --- a/win32/intl/bindtextdom.c +++ b/win32/intl/bindtextdom.c @@ -13,7 +13,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "intlconfig.h" diff --git a/win32/intl/dcgettext.c b/win32/intl/dcgettext.c index 64811b1e..043f19ed 100644 --- a/win32/intl/dcgettext.c +++ b/win32/intl/dcgettext.c @@ -13,7 +13,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "intlconfig.h" @@ -262,7 +262,7 @@ DCGETTEXT (domainname, msgid, category) if (binding == NULL) dirname = (char *) _nl_default_dirname; - else if (binding->dirname[0] == '/' || binding->dirname[1] == ':' ) /*FRANCO für win32*/ + else if (binding->dirname[0] == '/' || binding->dirname[1] == ':' ) /*FRANCO f�r win32*/ dirname = binding->dirname; else { diff --git a/win32/intl/dgettext.c b/win32/intl/dgettext.c index 264bba38..b6975251 100644 --- a/win32/intl/dgettext.c +++ b/win32/intl/dgettext.c @@ -13,7 +13,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <intlconfig.h> diff --git a/win32/intl/explodename.c b/win32/intl/explodename.c index a4f88c26..0d55a66d 100644 --- a/win32/intl/explodename.c +++ b/win32/intl/explodename.c @@ -13,7 +13,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "intlconfig.h" diff --git a/win32/intl/finddomain.c b/win32/intl/finddomain.c index 9d856e4b..1c25aa0f 100644 --- a/win32/intl/finddomain.c +++ b/win32/intl/finddomain.c @@ -14,7 +14,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "intlconfig.h" diff --git a/win32/intl/gettext.c b/win32/intl/gettext.c index b72f7342..51f921f7 100644 --- a/win32/intl/gettext.c +++ b/win32/intl/gettext.c @@ -13,7 +13,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "intlconfig.h" diff --git a/win32/intl/gettext.h b/win32/intl/gettext.h index 9108a2ed..64bbed2c 100644 --- a/win32/intl/gettext.h +++ b/win32/intl/gettext.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, - Fifth Floor, Boston, MA 02111-1307 USA. */ + Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef _GETTEXT_H #define _GETTEXT_H 1 diff --git a/win32/intl/gettextP.h b/win32/intl/gettextP.h index 87b076c3..d403ada7 100644 --- a/win32/intl/gettextP.h +++ b/win32/intl/gettextP.h @@ -14,7 +14,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef _GETTEXTP_H #define _GETTEXTP_H diff --git a/win32/intl/hash-string.h b/win32/intl/hash-string.h index 9bb0014f..a21b68ec 100644 --- a/win32/intl/hash-string.h +++ b/win32/intl/hash-string.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with the this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, - Fifth Floor, Boston, MA 02111-1307 USA. */ + Fifth Floor, Boston, MA 02110-1301 USA. */ /* @@ end of prolog @@ */ diff --git a/win32/intl/intl-compat.c b/win32/intl/intl-compat.c index 5f90dab4..4a405b86 100644 --- a/win32/intl/intl-compat.c +++ b/win32/intl/intl-compat.c @@ -14,7 +14,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "intlconfig.h" diff --git a/win32/intl/l10nflist.c b/win32/intl/l10nflist.c index d2c32df7..df7128fb 100644 --- a/win32/intl/l10nflist.c +++ b/win32/intl/l10nflist.c @@ -14,7 +14,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "intlconfig.h" diff --git a/win32/intl/libgettext.h b/win32/intl/libgettext.h index de4defd3..f1274bbd 100644 --- a/win32/intl/libgettext.h +++ b/win32/intl/libgettext.h @@ -13,7 +13,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* Because on some systems (e.g. Solaris) we sometimes have to include the systems libintl.h as well as this file we have more complex diff --git a/win32/intl/libintl.h b/win32/intl/libintl.h index 1dcc6af5..4dea79d1 100644 --- a/win32/intl/libintl.h +++ b/win32/intl/libintl.h @@ -16,7 +16,7 @@ GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
/* REPLACEMENT FOR ORIGINAL LIBINTL.H for use with Windows32 */
diff --git a/win32/intl/loadinfo.h b/win32/intl/loadinfo.h index 48326e97..2af57c32 100644 --- a/win32/intl/loadinfo.h +++ b/win32/intl/loadinfo.h @@ -14,7 +14,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef PARAMS # if __STDC__ diff --git a/win32/intl/loadmsgcat.c b/win32/intl/loadmsgcat.c index 57d148c3..4874ef1e 100644 --- a/win32/intl/loadmsgcat.c +++ b/win32/intl/loadmsgcat.c @@ -13,7 +13,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "intlconfig.h"
diff --git a/win32/intl/localealias.c b/win32/intl/localealias.c index dfdb8486..63619ab6 100644 --- a/win32/intl/localealias.c +++ b/win32/intl/localealias.c @@ -14,7 +14,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#include "intlconfig.h"
diff --git a/win32/intl/textdomain.c b/win32/intl/textdomain.c index 8ec2fd85..78b23a22 100644 --- a/win32/intl/textdomain.c +++ b/win32/intl/textdomain.c @@ -14,7 +14,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "intlconfig.h" diff --git a/win32/plugins/PadSSSPSX/PadSSSPSX.h b/win32/plugins/PadSSSPSX/PadSSSPSX.h index 37cc3274..85a0d2dd 100644 --- a/win32/plugins/PadSSSPSX/PadSSSPSX.h +++ b/win32/plugins/PadSSSPSX/PadSSSPSX.h @@ -13,7 +13,7 @@ *
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __PAD_H__
diff --git a/win32/plugins/dfsound/winsrc/dsound.h b/win32/plugins/dfsound/winsrc/dsound.h index 09299aea..0589cdbe 100644 --- a/win32/plugins/dfsound/winsrc/dsound.h +++ b/win32/plugins/dfsound/winsrc/dsound.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __WINE_DSOUND_H @@ -30,22 +30,22 @@ #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ -
-#ifndef WINELIB_NAME_AW
-#ifdef UNICODE
-#define WINELIB_NAME_AW(func) func##W
-#else
-#define WINELIB_NAME_AW(func) func##A
-#endif
-#endif
-
-#ifndef DECL_WINELIB_TYPE_AW
-#define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type;
-#endif
-
-#ifndef DWORD_PTR
-#define DWORD_PTR unsigned long
-#endif
+ +#ifndef WINELIB_NAME_AW +#ifdef UNICODE +#define WINELIB_NAME_AW(func) func##W +#else +#define WINELIB_NAME_AW(func) func##A +#endif +#endif + +#ifndef DECL_WINELIB_TYPE_AW +#define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type; +#endif + +#ifndef DWORD_PTR +#define DWORD_PTR unsigned long +#endif #ifndef DX_SHARED_DEFINES diff --git a/win32/plugins/dfxvideo/winsrc/d3d.h b/win32/plugins/dfxvideo/winsrc/d3d.h index 7297755d..31d61cbb 100644 --- a/win32/plugins/dfxvideo/winsrc/d3d.h +++ b/win32/plugins/dfxvideo/winsrc/d3d.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __WINE_D3D_H diff --git a/win32/plugins/dfxvideo/winsrc/d3dcaps.h b/win32/plugins/dfxvideo/winsrc/d3dcaps.h index b44c49d1..d631a675 100644 --- a/win32/plugins/dfxvideo/winsrc/d3dcaps.h +++ b/win32/plugins/dfxvideo/winsrc/d3dcaps.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __WINE_D3DCAPS_H diff --git a/win32/plugins/dfxvideo/winsrc/d3dtypes.h b/win32/plugins/dfxvideo/winsrc/d3dtypes.h index 21b9e74d..223a0755 100644 --- a/win32/plugins/dfxvideo/winsrc/d3dtypes.h +++ b/win32/plugins/dfxvideo/winsrc/d3dtypes.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* FIXME: Need to add C++ code for certain structs for headers - this is going to be a problem diff --git a/win32/plugins/dfxvideo/winsrc/ddraw.h b/win32/plugins/dfxvideo/winsrc/ddraw.h index 7cd1df41..1288e8bd 100644 --- a/win32/plugins/dfxvideo/winsrc/ddraw.h +++ b/win32/plugins/dfxvideo/winsrc/ddraw.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __WINE_DDRAW_H @@ -30,21 +30,21 @@ extern "C" { #define DIRECTDRAW_VERSION 0x0700 #endif /* DIRECTDRAW_VERSION */ -#ifndef WINELIB_NAME_AW
-#ifdef UNICODE
-#define WINELIB_NAME_AW(func) func##W
-#else
-#define WINELIB_NAME_AW(func) func##A
-#endif
-#endif
-
-#ifndef DECL_WINELIB_TYPE_AW
-#define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type;
-#endif
-
-#ifndef DWORD_PTR
-#define DWORD_PTR unsigned long
-#endif
+#ifndef WINELIB_NAME_AW +#ifdef UNICODE +#define WINELIB_NAME_AW(func) func##W +#else +#define WINELIB_NAME_AW(func) func##A +#endif +#endif + +#ifndef DECL_WINELIB_TYPE_AW +#define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type; +#endif + +#ifndef DWORD_PTR +#define DWORD_PTR unsigned long +#endif /***************************************************************************** * Predeclare the interfaces |