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 /win32 | |
| 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
Diffstat (limited to 'win32')
31 files changed, 63 insertions, 63 deletions
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 |
