From DONOTREPLY at icculus.org Sat Mar 8 21:44:53 2008 From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org) Date: 8 Mar 2008 21:44:53 -0500 Subject: r931 - branches/stable-1.0 branches/stable-1.0/platform trunk trunk/platform Message-ID: <20080309024453.26739.qmail@icculus.org> Author: icculus Date: 2008-03-08 21:44:50 -0500 (Sat, 08 Mar 2008) New Revision: 931 Modified: branches/stable-1.0/CHANGELOG branches/stable-1.0/platform/win32.c trunk/CHANGELOG.txt trunk/platform/windows.c Log: Fixed compiler warnings in win32 API calls (thanks, Dennis!). Modified: branches/stable-1.0/CHANGELOG =================================================================== --- branches/stable-1.0/CHANGELOG 2008-02-20 12:24:10 UTC (rev 930) +++ branches/stable-1.0/CHANGELOG 2008-03-09 02:44:50 UTC (rev 931) @@ -4,6 +4,7 @@ -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc --- +03082008 - Fixed compiler warnings in Windows platform layer (thanks, Dennis!). 02202008 - Various archiver swap and compare functions now check if they are swapping/comparing an item against itself, for efficiency and to prevent overlapping memcpy() calls. Modified: branches/stable-1.0/platform/win32.c =================================================================== --- branches/stable-1.0/platform/win32.c 2008-02-20 12:24:10 UTC (rev 930) +++ branches/stable-1.0/platform/win32.c 2008-03-09 02:44:50 UTC (rev 931) @@ -850,8 +850,8 @@ int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos) { HANDLE FileHandle = ((win32file *) opaque)->handle; - DWORD HighOrderPos; - DWORD *pHighOrderPos; + LONG HighOrderPos; + PLONG pHighOrderPos; DWORD rc; /* Get the high order 32-bits of the position */ @@ -888,7 +888,7 @@ PHYSFS_sint64 __PHYSFS_platformTell(void *opaque) { HANDLE FileHandle = ((win32file *) opaque)->handle; - DWORD HighPos = 0; + LONG HighPos = 0; DWORD LowPos; PHYSFS_sint64 retval; Modified: trunk/CHANGELOG.txt =================================================================== --- trunk/CHANGELOG.txt 2008-02-20 12:24:10 UTC (rev 930) +++ trunk/CHANGELOG.txt 2008-03-09 02:44:50 UTC (rev 931) @@ -2,6 +2,7 @@ * CHANGELOG. */ +03082008 - Fixed compiler warnings in Windows platform layer (thanks, Dennis!). 02202008 - Various archiver swap and compare functions now check if they are swapping/comparing an item against itself, for efficiency and to prevent overlapping memcpy() calls. Modified: trunk/platform/windows.c =================================================================== --- trunk/platform/windows.c 2008-02-20 12:24:10 UTC (rev 930) +++ trunk/platform/windows.c 2008-03-09 02:44:50 UTC (rev 931) @@ -1089,8 +1089,8 @@ int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos) { HANDLE Handle = ((WinApiFile *) opaque)->handle; - DWORD HighOrderPos; - DWORD *pHighOrderPos; + LONG HighOrderPos; + PLONG pHighOrderPos; DWORD rc; /* Get the high order 32-bits of the position */ @@ -1127,7 +1127,7 @@ PHYSFS_sint64 __PHYSFS_platformTell(void *opaque) { HANDLE Handle = ((WinApiFile *) opaque)->handle; - DWORD HighPos = 0; + LONG HighPos = 0; DWORD LowPos; PHYSFS_sint64 retval; From DONOTREPLY at icculus.org Tue Mar 11 01:14:35 2008 From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org) Date: 11 Mar 2008 01:14:35 -0400 Subject: r932 - in branches/stable-1.0: . platform Message-ID: <20080311051435.3924.qmail@icculus.org> Author: icculus Date: 2008-03-11 01:14:35 -0400 (Tue, 11 Mar 2008) New Revision: 932 Modified: branches/stable-1.0/CHANGELOG branches/stable-1.0/CREDITS branches/stable-1.0/platform/win32.c Log: Had a "msgbuf" where I should have had a "msgbuf[0]" (thanks, James!). Modified: branches/stable-1.0/CHANGELOG =================================================================== --- branches/stable-1.0/CHANGELOG 2008-03-09 02:44:50 UTC (rev 931) +++ branches/stable-1.0/CHANGELOG 2008-03-11 05:14:35 UTC (rev 932) @@ -4,6 +4,7 @@ -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc --- +03112008 - Fixed wrong array index in Windows platform layer (thanks, James!). 03082008 - Fixed compiler warnings in Windows platform layer (thanks, Dennis!). 02202008 - Various archiver swap and compare functions now check if they are swapping/comparing an item against itself, for efficiency and Modified: branches/stable-1.0/CREDITS =================================================================== --- branches/stable-1.0/CREDITS 2008-03-09 02:44:50 UTC (rev 931) +++ branches/stable-1.0/CREDITS 2008-03-11 05:14:35 UTC (rev 932) @@ -78,6 +78,7 @@ Bug fixes: J?rg Walter + James Haley Windows .rc file: Dennis Schridde Modified: branches/stable-1.0/platform/win32.c =================================================================== --- branches/stable-1.0/platform/win32.c 2008-03-09 02:44:50 UTC (rev 931) +++ branches/stable-1.0/platform/win32.c 2008-03-11 05:14:35 UTC (rev 932) @@ -90,9 +90,9 @@ ); if (rc == 0) - msgbuf = '\0'; /* oh well. */ + msgbuf[0] = '\0'; /* oh well. Empty string. */ - /* chop off newlines. */ + /* chop off newlines... */ for (ptr = msgbuf; *ptr; ptr++) { if ((*ptr == '\n') || (*ptr == '\r')) From DONOTREPLY at icculus.org Tue Mar 11 01:19:56 2008 From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org) Date: 11 Mar 2008 01:19:56 -0400 Subject: r933 - trunk Message-ID: <20080311051956.11584.qmail@icculus.org> Author: icculus Date: 2008-03-11 01:19:56 -0400 (Tue, 11 Mar 2008) New Revision: 933 Modified: trunk/CHANGELOG.txt trunk/CREDITS.txt Log: Changed some text files from ISO-8859-1 to UTF-8. Modified: trunk/CHANGELOG.txt =================================================================== --- trunk/CHANGELOG.txt 2008-03-11 05:14:35 UTC (rev 932) +++ trunk/CHANGELOG.txt 2008-03-11 05:19:56 UTC (rev 933) @@ -2,6 +2,7 @@ * CHANGELOG. */ +03102008 - Changed some text files from ISO-8859-1 to UTF-8. 03082008 - Fixed compiler warnings in Windows platform layer (thanks, Dennis!). 02202008 - Various archiver swap and compare functions now check if they are swapping/comparing an item against itself, for efficiency and @@ -141,7 +142,7 @@ 08202005 - Fixed bug in verifyPath() that was breaking PHYSFS_setSaneConfig() and other corner cases. 07242005 - Patched to compile on BeOS. -07232005 - Fixed bug in zip archiver (thanks, J?rg Walter!). +07232005 - Fixed bug in zip archiver (thanks, J??rg Walter!). More minor OS/2 tweaks. Updated zlib to 1.2.3, which properly includes the security fix. Fixed "make dist" to handle .svn dirs and other file changes. Removed "debian" directory. Allow a mount @@ -341,9 +342,9 @@ 07302002 - Minor error handling fix (thanks, Alexander!) 07292002 - Found some memory leaks, thanks to Valgrind (which rules, btw). Added Russian translations (koi8-r, cp1251, cp866, and iso-8859-5) - by Ed Sinjiashvili. Added Spanish translation by Pedro J. P?rez. + by Ed Sinjiashvili. Added Spanish translation by Pedro J. P??rez. Debian package support in CVS, thanks to Colin Bayer. French - translation by St?phane Peter. + translation by St??phane Peter. 07282002 - macclassic.c now returns human readable error messages instead of ERR_OS_ERROR. Closing files on MacOS no longer fails if the volume info can't be flushed. Minor error message tweak in os2.c. All Modified: trunk/CREDITS.txt =================================================================== --- trunk/CREDITS.txt 2008-03-11 05:14:35 UTC (rev 932) +++ trunk/CREDITS.txt 2008-03-11 05:19:56 UTC (rev 933) @@ -32,7 +32,7 @@ Ed Sinjiashvili French translation: - St?phane Peter + St??phane Peter Debian package support: Colin Bayer @@ -67,7 +67,7 @@ Danny Angelo Carminati Grein Spanish translation: - Pedro J. P?rez + Pedro J. P??rez MacOS Classic fixes, MPW support, @@ -79,7 +79,7 @@ Matze Braun Bug fixes: - J?rg Walter + J??rg Walter Windows .rc file, 7zip/lzma archiver: From DONOTREPLY at icculus.org Tue Mar 11 01:28:13 2008 From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org) Date: 11 Mar 2008 01:28:13 -0400 Subject: r934 - trunk Message-ID: <20080311052813.23344.qmail@icculus.org> Author: icculus Date: 2008-03-11 01:28:13 -0400 (Tue, 11 Mar 2008) New Revision: 934 Modified: trunk/physfs_internal.h Log: Converted translations to UTF-8 (and removed duplicate Russian translations, since UTF-8 replaces the various other character encodings). Modified: trunk/physfs_internal.h =================================================================== --- trunk/physfs_internal.h 2008-03-11 05:19:56 UTC (rev 933) +++ trunk/physfs_internal.h 2008-03-11 05:28:13 UTC (rev 934) @@ -78,15 +78,13 @@ # define PHYSFS_LANG PHYSFS_LANG_ENGLISH #endif +/* All language strings are UTF-8 encoded! */ #define PHYSFS_LANG_ENGLISH 1 /* English by Ryan C. Gordon */ -#define PHYSFS_LANG_RUSSIAN_KOI8_R 2 /* Russian by Ed Sinjiashvili */ -#define PHYSFS_LANG_RUSSIAN_CP1251 3 /* Russian by Ed Sinjiashvili */ -#define PHYSFS_LANG_RUSSIAN_CP866 4 /* Russian by Ed Sinjiashvili */ -#define PHYSFS_LANG_RUSSIAN_ISO_8859_5 5 /* Russian by Ed Sinjiashvili */ -#define PHYSFS_LANG_SPANISH 6 /* Spanish by Pedro J. P?rez */ -#define PHYSFS_LANG_FRENCH 7 /* French by St?phane Peter */ -#define PHYSFS_LANG_GERMAN 8 /* German by Michael Renner */ -#define PHYSFS_LANG_PORTUGUESE_BR 9 /* pt-br by Danny Angelo Carminati Grein */ +#define PHYSFS_LANG_RUSSIAN 2 /* Russian by Ed Sinjiashvili */ +#define PHYSFS_LANG_SPANISH 3 /* Spanish by Pedro J. P??rez */ +#define PHYSFS_LANG_FRENCH 4 /* French by St??phane Peter */ +#define PHYSFS_LANG_GERMAN 5 /* German by Michael Renner */ +#define PHYSFS_LANG_PORTUGUESE_BR 6 /* pt-br by Danny Angelo Carminati Grein */ #if (PHYSFS_LANG == PHYSFS_LANG_ENGLISH) #define DIR_ARCHIVE_DESCRIPTION "Non-archive, direct filesystem I/O" @@ -199,13 +197,13 @@ #define ERR_IS_INITIALIZED "Bereits initialisiert" #define ERR_NOT_INITIALIZED "Nicht initialisiert" - #define ERR_INVALID_ARGUMENT "Ung?ltiges Argument" - #define ERR_FILES_STILL_OPEN "Dateien noch immer ge?ffnet" + #define ERR_INVALID_ARGUMENT "Ung??ltiges Argument" + #define ERR_FILES_STILL_OPEN "Dateien noch immer ge??ffnet" #define ERR_NO_DIR_CREATE "Fehler beim Erzeugen der Verzeichnisse" #define ERR_OUT_OF_MEMORY "Kein Speicher mehr frei" #define ERR_NOT_IN_SEARCH_PATH "Eintrag nicht im Suchpfad enthalten" - #define ERR_NOT_SUPPORTED "Befehl nicht unterst?tzt" - #define ERR_UNSUPPORTED_ARCHIVE "Archiv-Typ nicht unterst?tzt" + #define ERR_NOT_SUPPORTED "Befehl nicht unterst??tzt" + #define ERR_UNSUPPORTED_ARCHIVE "Archiv-Typ nicht unterst??tzt" #define ERR_NOT_A_HANDLE "Ist kein Dateideskriptor" #define ERR_INSECURE_FNAME "Unsicherer Dateiname" #define ERR_SYMLINK_DISALLOWED "Symbolische Verweise deaktiviert" @@ -214,7 +212,7 @@ #define ERR_NO_SUCH_PATH "Pfad nicht gefunden" #define ERR_NO_SUCH_VOLUME "Datencontainer nicht gefunden" #define ERR_PAST_EOF "Hinter dem Ende der Datei" - #define ERR_ARC_IS_READ_ONLY "Archiv ist schreibgesch?tzt" + #define ERR_ARC_IS_READ_ONLY "Archiv ist schreibgesch??tzt" #define ERR_IO_ERROR "Ein/Ausgabe Fehler" #define ERR_CANT_SET_WRITE_DIR "Kann Schreibverzeichnis nicht setzen" #define ERR_SYMLINK_LOOP "Endlosschleife durch symbolische Verweise" @@ -225,12 +223,12 @@ #define ERR_NOT_A_FILE "Ist keine Datei" #define ERR_NOT_A_DIR "Ist kein Verzeichnis" #define ERR_NOT_AN_ARCHIVE "Ist kein Archiv" - #define ERR_CORRUPTED "Besch?digtes Archiv" + #define ERR_CORRUPTED "Besch??digtes Archiv" #define ERR_SEEK_OUT_OF_RANGE "Suche war ausserhalb der Reichweite" - #define ERR_BAD_FILENAME "Unzul?ssiger Dateiname" - #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS verursachte einen ung?ltigen Systemaufruf" + #define ERR_BAD_FILENAME "Unzul??ssiger Dateiname" + #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS verursachte einen ung??ltigen Systemaufruf" #define ERR_ARGV0_IS_NULL "argv0 ist NULL" - #define ERR_NEED_DICT "brauche W?rterbuch" + #define ERR_NEED_DICT "brauche W??rterbuch" #define ERR_DATA_ERROR "Datenfehler" #define ERR_MEMORY_ERROR "Speicherfehler" #define ERR_BUFFER_ERROR "Bufferfehler" @@ -246,10 +244,10 @@ #define ERR_VOL_LOCKED_HW "Datencontainer ist durch Hardware gesperrt" #define ERR_VOL_LOCKED_SW "Datencontainer ist durch Software gesperrt" #define ERR_FILE_LOCKED "Datei ist gesperrt" - #define ERR_FILE_OR_DIR_BUSY "Datei/Verzeichnis ist besch?ftigt" - #define ERR_FILE_ALREADY_OPEN_W "Datei schon im Schreibmodus ge?ffnet" - #define ERR_FILE_ALREADY_OPEN_R "Datei schon im Lesemodus ge?ffnet" - #define ERR_INVALID_REFNUM "Ung?ltige Referenznummer" + #define ERR_FILE_OR_DIR_BUSY "Datei/Verzeichnis ist besch??ftigt" + #define ERR_FILE_ALREADY_OPEN_W "Datei schon im Schreibmodus ge??ffnet" + #define ERR_FILE_ALREADY_OPEN_R "Datei schon im Lesemodus ge??ffnet" + #define ERR_INVALID_REFNUM "Ung??ltige Referenznummer" #define ERR_GETTING_FILE_POS "Fehler beim Finden der Dateiposition" #define ERR_VOLUME_OFFLINE "Datencontainer ist offline" #define ERR_PERMISSION_DENIED "Zugriff verweigert" @@ -258,7 +256,7 @@ #define ERR_NOT_MAC_DISK "Ist kein Macintosh Laufwerk" #define ERR_VOL_EXTERNAL_FS "Datencontainer liegt auf einem externen Dateisystem" #define ERR_PROBLEM_RENAME "Fehler beim Umbenennen" - #define ERR_BAD_MASTER_BLOCK "Besch?digter Hauptverzeichnisblock" + #define ERR_BAD_MASTER_BLOCK "Besch??digter Hauptverzeichnisblock" #define ERR_CANT_MOVE_FORBIDDEN "Verschieben nicht erlaubt" #define ERR_WRONG_VOL_TYPE "Falscher Datencontainer-Typ" #define ERR_SERVER_VOL_LOST "Datencontainer am Server wurde getrennt" @@ -271,13 +269,13 @@ #define ERR_NOT_A_DOS_DISK "Ist kein DOS-Laufwerk" #define ERR_SHARING_VIOLATION "Zugriffsverletzung" #define ERR_CANNOT_MAKE "Kann nicht erzeugen" - #define ERR_DEV_IN_USE "Ger?t wird bereits benutzt" - #define ERR_OPEN_FAILED "?ffnen fehlgeschlagen" + #define ERR_DEV_IN_USE "Ger??t wird bereits benutzt" + #define ERR_OPEN_FAILED "??ffnen fehlgeschlagen" #define ERR_PIPE_BUSY "Pipeverbindung ist belegt" - #define ERR_SHARING_BUF_EXCEEDED "Zugriffsbuffer ?berschritten" + #define ERR_SHARING_BUF_EXCEEDED "Zugriffsbuffer ??berschritten" #define ERR_TOO_MANY_HANDLES "Zu viele offene Dateien" #define ERR_SEEK_ERROR "Fehler beim Suchen" - #define ERR_DEL_CWD "Aktuelles Arbeitsverzeichnis darf nicht gel?scht werden" + #define ERR_DEL_CWD "Aktuelles Arbeitsverzeichnis darf nicht gel??scht werden" #define ERR_WRITE_PROTECT_ERROR "Schreibschutzfehler" #define ERR_WRITE_FAULT "Schreibfehler" #define ERR_LOCK_VIOLATION "Sperrverletzung" @@ -286,401 +284,107 @@ #define ERR_PROT_VIOLATION "Schutzverletzung" #define ERR_BROKEN_PIPE "Pipeverbindung unterbrochen" -#elif (PHYSFS_LANG == PHYSFS_LANG_RUSSIAN_KOI8_R) - #define DIR_ARCHIVE_DESCRIPTION "?? ?????, ???????????????? ????/????? ???????? ???????" - #define GRP_ARCHIVE_DESCRIPTION "?????? ?????????? ????? Build engine" +#elif (PHYSFS_LANG == PHYSFS_LANG_RUSSIAN) + #define DIR_ARCHIVE_DESCRIPTION "???? ??????????, ???????????????????????????????? ????????/?????????? ???????????????? ??????????????" + #define GRP_ARCHIVE_DESCRIPTION "???????????? ???????????????????? ?????????? Build engine" #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format" #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format" - #define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip ???????????" + #define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip ??????????????????????" #define WAD_ARCHIVE_DESCRIPTION "DOOM engine format" /* !!! FIXME: translate this line if needed */ #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ - #define ERR_IS_INITIALIZED "??? ???????????????" - #define ERR_NOT_INITIALIZED "?? ???????????????" - #define ERR_INVALID_ARGUMENT "???????? ????????" - #define ERR_FILES_STILL_OPEN "????? ??? ???????" - #define ERR_NO_DIR_CREATE "?? ???? ??????? ????????" - #define ERR_OUT_OF_MEMORY "????????? ??????" - #define ERR_NOT_IN_SEARCH_PATH "??? ?????? ???????? ? ???? ??????" - #define ERR_NOT_SUPPORTED "???????? ?? ??????????????" - #define ERR_UNSUPPORTED_ARCHIVE "?????? ?????? ???? ?? ??????????????" - #define ERR_NOT_A_HANDLE "?? ???????? ??????????" - #define ERR_INSECURE_FNAME "???????????? ??? ?????" - #define ERR_SYMLINK_DISALLOWED "?????????? ?????? ?????????" - #define ERR_NO_WRITE_DIR "??????? ??? ?????? ?? ??????????" - #define ERR_NO_SUCH_FILE "???? ?? ??????" - #define ERR_NO_SUCH_PATH "???? ?? ??????" - #define ERR_NO_SUCH_VOLUME "??? ?? ??????" - #define ERR_PAST_EOF "?? ?????? ?????" - #define ERR_ARC_IS_READ_ONLY "????? ?????? ??? ??????" - #define ERR_IO_ERROR "?????? ?????/??????" - #define ERR_CANT_SET_WRITE_DIR "?? ???? ?????????? ??????? ??? ??????" - #define ERR_SYMLINK_LOOP "??????????? ???? ?????????? ??????" - #define ERR_COMPRESSION "?????? (???)???????" - #define ERR_NOT_IMPLEMENTED "?? ???????????" - #define ERR_OS_ERROR "???????????? ??????? ???????? ??????" - #define ERR_FILE_EXISTS "???? ??? ??????????" - #define ERR_NOT_A_FILE "?? ????" - #define ERR_NOT_A_DIR "?? ???????" - #define ERR_NOT_AN_ARCHIVE "?? ?????" - #define ERR_CORRUPTED "???????????? ?????" - #define ERR_SEEK_OUT_OF_RANGE "???????????????? ?? ???????" - #define ERR_BAD_FILENAME "???????? ??? ?????" - #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS ????????? ???????? ????????? ?????" + #define ERR_IS_INITIALIZED "?????? ??????????????????????????????" + #define ERR_NOT_INITIALIZED "???? ??????????????????????????????" + #define ERR_INVALID_ARGUMENT "???????????????? ????????????????" + #define ERR_FILES_STILL_OPEN "?????????? ?????? ??????????????" + #define ERR_NO_DIR_CREATE "???? ???????? ?????????????? ????????????????" + #define ERR_OUT_OF_MEMORY "?????????????????? ????????????" + #define ERR_NOT_IN_SEARCH_PATH "?????? ???????????? ???????????????? ?? ???????? ????????????" + #define ERR_NOT_SUPPORTED "???????????????? ???? ????????????????????????????" + #define ERR_UNSUPPORTED_ARCHIVE "???????????? ???????????? ???????? ???? ????????????????????????????" + #define ERR_NOT_A_HANDLE "???? ???????????????? ????????????????????" + #define ERR_INSECURE_FNAME "???????????????????????? ?????? ??????????" + #define ERR_SYMLINK_DISALLOWED "???????????????????? ???????????? ??????????????????" + #define ERR_NO_WRITE_DIR "?????????????? ?????? ???????????? ???? ????????????????????" + #define ERR_NO_SUCH_FILE "???????? ???? ????????????" + #define ERR_NO_SUCH_PATH "???????? ???? ????????????" + #define ERR_NO_SUCH_VOLUME "?????? ???? ????????????" + #define ERR_PAST_EOF "???? ???????????? ??????????" + #define ERR_ARC_IS_READ_ONLY "?????????? ???????????? ?????? ????????????" + #define ERR_IO_ERROR "???????????? ??????????/????????????" + #define ERR_CANT_SET_WRITE_DIR "???? ???????? ???????????????????? ?????????????? ?????? ????????????" + #define ERR_SYMLINK_LOOP "?????????????????????? ???????? ???????????????????? ????????????" + #define ERR_COMPRESSION "???????????? (??????)??????????????" + #define ERR_NOT_IMPLEMENTED "???? ??????????????????????" + #define ERR_OS_ERROR "???????????????????????? ?????????????? ???????????????? ????????????" + #define ERR_FILE_EXISTS "???????? ?????? ????????????????????" + #define ERR_NOT_A_FILE "???? ????????" + #define ERR_NOT_A_DIR "???? ??????????????" + #define ERR_NOT_AN_ARCHIVE "???? ??????????" + #define ERR_CORRUPTED "???????????????????????? ??????????" + #define ERR_SEEK_OUT_OF_RANGE "???????????????????????????????? ???? ??????????????" + #define ERR_BAD_FILENAME "???????????????? ?????? ??????????" + #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS ?????????????????? ???????????????? ?????????????????? ??????????" #define ERR_ARGV0_IS_NULL "argv0 is NULL" - #define ERR_NEED_DICT "????? ???????" - #define ERR_DATA_ERROR "?????? ??????" - #define ERR_MEMORY_ERROR "?????? ??????" - #define ERR_BUFFER_ERROR "?????? ??????" - #define ERR_VERSION_ERROR "?????? ??????" - #define ERR_UNKNOWN_ERROR "??????????? ??????" - #define ERR_SEARCHPATH_TRUNC "???? ?????? ???????" - #define ERR_GETMODFN_TRUNC "GetModuleFileName() ???????" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() ?? ??????? ???????" - #define ERR_DISK_FULL "???? ?????" - #define ERR_DIRECTORY_FULL "??????? ?????" - #define ERR_MACOS_GENERIC "MacOS ???????? ?????? (%d)" - #define ERR_OS2_GENERIC "OS/2 ???????? ?????? (%d)" - #define ERR_VOL_LOCKED_HW "??? ?????????? ?????????" - #define ERR_VOL_LOCKED_SW "??? ?????????? ??????????" - #define ERR_FILE_LOCKED "???? ????????????" - #define ERR_FILE_OR_DIR_BUSY "????/??????? ?????" - #define ERR_FILE_ALREADY_OPEN_W "???? ??? ?????? ?? ??????" - #define ERR_FILE_ALREADY_OPEN_R "???? ??? ?????? ?? ??????" - #define ERR_INVALID_REFNUM "???????? ?????????? ??????" - #define ERR_GETTING_FILE_POS "?????? ??? ????????? ??????? ?????" - #define ERR_VOLUME_OFFLINE "??? ??????????" - #define ERR_PERMISSION_DENIED "???????? ? ??????????" - #define ERR_VOL_ALREADY_ONLINE "??? ??? ???????????" - #define ERR_NO_SUCH_DRIVE "??? ?????? ?????" - #define ERR_NOT_MAC_DISK "?? ???? Macintosh" - #define ERR_VOL_EXTERNAL_FS "??? ??????????? ??????? ???????? ???????" - #define ERR_PROBLEM_RENAME "???????? ??? ??????????????" - #define ERR_BAD_MASTER_BLOCK "?????? ??????? ???? ????????" - #define ERR_CANT_MOVE_FORBIDDEN "??????? ??????????? ?????????" - #define ERR_WRONG_VOL_TYPE "???????? ??? ????" - #define ERR_SERVER_VOL_LOST "????????? ??? ??? ??????????" - #define ERR_FILE_ID_NOT_FOUND "????????????? ????? ?? ??????" - #define ERR_FILE_ID_EXISTS "????????????? ????? ??? ??????????" - #define ERR_SERVER_NO_RESPOND "?????? ?? ????????" - #define ERR_USER_AUTH_FAILED "????????????? ???????????? ?? ???????" - #define ERR_PWORD_EXPIRED "?????? ?? ??????? ???????" - #define ERR_ACCESS_DENIED "???????? ? ???????" - #define ERR_NOT_A_DOS_DISK "?? ???? DOS" - #define ERR_SHARING_VIOLATION "????????? ??????????? ???????" - #define ERR_CANNOT_MAKE "?? ???? ???????" - #define ERR_DEV_IN_USE "?????????? ??? ????????????" - #define ERR_OPEN_FAILED "???????? ?? ???????" - #define ERR_PIPE_BUSY "???????? ?????" - #define ERR_SHARING_BUF_EXCEEDED "??????????? ????? ??????????" - #define ERR_TOO_MANY_HANDLES "??????? ????? ???????? ????????????" - #define ERR_SEEK_ERROR "?????? ????????????????" - #define ERR_DEL_CWD "??????? ??????? ??????? ??????? ???????" - #define ERR_WRITE_PROTECT_ERROR "?????? ?????? ??????" - #define ERR_WRITE_FAULT "?????? ??????" - #define ERR_LOCK_VIOLATION "????????? ??????????" - #define ERR_GEN_FAILURE "????? ????" - #define ERR_UNCERTAIN_MEDIA "?????????????? ????????" - #define ERR_PROT_VIOLATION "????????? ??????" - #define ERR_BROKEN_PIPE "????????? ????????" + #define ERR_NEED_DICT "?????????? ??????????????" + #define ERR_DATA_ERROR "???????????? ????????????" + #define ERR_MEMORY_ERROR "???????????? ????????????" + #define ERR_BUFFER_ERROR "???????????? ????????????" + #define ERR_VERSION_ERROR "???????????? ????????????" + #define ERR_UNKNOWN_ERROR "?????????????????????? ????????????" + #define ERR_SEARCHPATH_TRUNC "???????? ???????????? ??????????????" + #define ERR_GETMODFN_TRUNC "GetModuleFileName() ??????????????" + #define ERR_GETMODFN_NO_DIR "GetModuleFileName() ???? ?????????????? ??????????????" + #define ERR_DISK_FULL "???????? ??????????" + #define ERR_DIRECTORY_FULL "?????????????? ??????????" + #define ERR_MACOS_GENERIC "MacOS ???????????????? ???????????? (%d)" + #define ERR_OS2_GENERIC "OS/2 ???????????????? ???????????? (%d)" + #define ERR_VOL_LOCKED_HW "?????? ???????????????????? ??????????????????" + #define ERR_VOL_LOCKED_SW "?????? ???????????????????? ????????????????????" + #define ERR_FILE_LOCKED "???????? ????????????????????????" + #define ERR_FILE_OR_DIR_BUSY "????????/?????????????? ??????????" + #define ERR_FILE_ALREADY_OPEN_W "???????? ?????? ???????????? ???? ????????????" + #define ERR_FILE_ALREADY_OPEN_R "???????? ?????? ???????????? ???? ????????????" + #define ERR_INVALID_REFNUM "???????????????? ???????????????????? ????????????" + #define ERR_GETTING_FILE_POS "???????????? ?????? ?????????????????? ?????????????? ??????????" + #define ERR_VOLUME_OFFLINE "?????? ????????????????????" + #define ERR_PERMISSION_DENIED "???????????????? ?? ????????????????????" + #define ERR_VOL_ALREADY_ONLINE "?????? ?????? ??????????????????????" + #define ERR_NO_SUCH_DRIVE "?????? ???????????? ??????????" + #define ERR_NOT_MAC_DISK "???? ???????? Macintosh" + #define ERR_VOL_EXTERNAL_FS "?????? ?????????????????????? ?????????????? ???????????????? ??????????????" + #define ERR_PROBLEM_RENAME "???????????????? ?????? ????????????????????????????" + #define ERR_BAD_MASTER_BLOCK "???????????? ?????????????? ???????? ????????????????" + #define ERR_CANT_MOVE_FORBIDDEN "?????????????? ?????????????????????? ??????????????????" + #define ERR_WRONG_VOL_TYPE "???????????????? ?????? ????????" + #define ERR_SERVER_VOL_LOST "?????????????????? ?????? ?????? ????????????????????" + #define ERR_FILE_ID_NOT_FOUND "?????????????????????????? ?????????? ???? ????????????" + #define ERR_FILE_ID_EXISTS "?????????????????????????? ?????????? ?????? ????????????????????" + #define ERR_SERVER_NO_RESPOND "???????????? ???? ????????????????" + #define ERR_USER_AUTH_FAILED "?????????????????????????? ???????????????????????? ???? ??????????????" + #define ERR_PWORD_EXPIRED "???????????? ???? ?????????????? ??????????????" + #define ERR_ACCESS_DENIED "???????????????? ?? ??????????????" + #define ERR_NOT_A_DOS_DISK "???? ???????? DOS" + #define ERR_SHARING_VIOLATION "?????????????????? ?????????????????????? ??????????????" + #define ERR_CANNOT_MAKE "???? ???????? ??????????????" + #define ERR_DEV_IN_USE "???????????????????? ?????? ????????????????????????" + #define ERR_OPEN_FAILED "???????????????? ???? ??????????????" + #define ERR_PIPE_BUSY "???????????????? ??????????" + #define ERR_SHARING_BUF_EXCEEDED "?????????????????????? ?????????? ????????????????????" + #define ERR_TOO_MANY_HANDLES "?????????????? ?????????? ???????????????? ????????????????????????" + #define ERR_SEEK_ERROR "???????????? ????????????????????????????????" + #define ERR_DEL_CWD "?????????????? ?????????????? ?????????????? ?????????????? ??????????????" + #define ERR_WRITE_PROTECT_ERROR "???????????? ???????????? ????????????" + #define ERR_WRITE_FAULT "???????????? ????????????" + #define ERR_LOCK_VIOLATION "?????????????????? ????????????????????" + #define ERR_GEN_FAILURE "?????????? ????????" + #define ERR_UNCERTAIN_MEDIA "???????????????????????????? ????????????????" + #define ERR_PROT_VIOLATION "?????????????????? ????????????" + #define ERR_BROKEN_PIPE "?????????????????? ????????????????" -#elif (PHYSFS_LANG == PHYSFS_LANG_RUSSIAN_CP1251) - #define DIR_ARCHIVE_DESCRIPTION "?? ?????, ???????????????? ????/????? ???????? ???????" - #define GRP_ARCHIVE_DESCRIPTION "?????? ?????????? ????? Build engine" - #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format" - #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format" - #define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip ???????????" - #define WAD_ARCHIVE_DESCRIPTION "DOOM engine format" /* !!! FIXME: translate this line if needed */ - #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ - #define ERR_IS_INITIALIZED "??? ???????????????" - #define ERR_NOT_INITIALIZED "?? ???????????????" - #define ERR_INVALID_ARGUMENT "???????? ????????" - #define ERR_FILES_STILL_OPEN "????? ??? ???????" - #define ERR_NO_DIR_CREATE "?? ???? ??????? ????????" - #define ERR_OUT_OF_MEMORY "????????? ??????" - #define ERR_NOT_IN_SEARCH_PATH "??? ?????? ???????? ? ???? ??????" - #define ERR_NOT_SUPPORTED "???????? ?? ??????????????" - #define ERR_UNSUPPORTED_ARCHIVE "?????? ?????? ???? ?? ??????????????" - #define ERR_NOT_A_HANDLE "?? ???????? ??????????" - #define ERR_INSECURE_FNAME "???????????? ??? ?????" - #define ERR_SYMLINK_DISALLOWED "?????????? ?????? ?????????" - #define ERR_NO_WRITE_DIR "??????? ??? ?????? ?? ??????????" - #define ERR_NO_SUCH_FILE "???? ?? ??????" - #define ERR_NO_SUCH_PATH "???? ?? ??????" - #define ERR_NO_SUCH_VOLUME "??? ?? ??????" - #define ERR_PAST_EOF "?? ?????? ?????" - #define ERR_ARC_IS_READ_ONLY "????? ?????? ??? ??????" - #define ERR_IO_ERROR "?????? ?????/??????" - #define ERR_CANT_SET_WRITE_DIR "?? ???? ?????????? ??????? ??? ??????" - #define ERR_SYMLINK_LOOP "??????????? ???? ?????????? ??????" - #define ERR_COMPRESSION "?????? (???)???????" - #define ERR_NOT_IMPLEMENTED "?? ???????????" - #define ERR_OS_ERROR "???????????? ??????? ???????? ??????" - #define ERR_FILE_EXISTS "???? ??? ??????????" - #define ERR_NOT_A_FILE "?? ????" - #define ERR_NOT_A_DIR "?? ???????" - #define ERR_NOT_AN_ARCHIVE "?? ?????" - #define ERR_CORRUPTED "???????????? ?????" - #define ERR_SEEK_OUT_OF_RANGE "???????????????? ?? ???????" - #define ERR_BAD_FILENAME "???????? ??? ?????" - #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS ????????? ???????? ????????? ?????" - #define ERR_ARGV0_IS_NULL "argv0 is NULL" - #define ERR_NEED_DICT "????? ???????" - #define ERR_DATA_ERROR "?????? ??????" - #define ERR_MEMORY_ERROR "?????? ??????" - #define ERR_BUFFER_ERROR "?????? ??????" - #define ERR_VERSION_ERROR "?????? ??????" - #define ERR_UNKNOWN_ERROR "??????????? ??????" - #define ERR_SEARCHPATH_TRUNC "???? ?????? ???????" - #define ERR_GETMODFN_TRUNC "GetModuleFileName() ???????" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() ?? ??????? ???????" - #define ERR_DISK_FULL "???? ?????" - #define ERR_DIRECTORY_FULL "??????? ?????" - #define ERR_MACOS_GENERIC "MacOS ???????? ?????? (%d)" - #define ERR_OS2_GENERIC "OS/2 ???????? ?????? (%d)" - #define ERR_VOL_LOCKED_HW "??? ?????????? ?????????" - #define ERR_VOL_LOCKED_SW "??? ?????????? ??????????" - #define ERR_FILE_LOCKED "???? ????????????" - #define ERR_FILE_OR_DIR_BUSY "????/??????? ?????" - #define ERR_FILE_ALREADY_OPEN_W "???? ??? ?????? ?? ??????" - #define ERR_FILE_ALREADY_OPEN_R "???? ??? ?????? ?? ??????" - #define ERR_INVALID_REFNUM "???????? ?????????? ??????" - #define ERR_GETTING_FILE_POS "?????? ??? ????????? ??????? ?????" - #define ERR_VOLUME_OFFLINE "??? ??????????" - #define ERR_PERMISSION_DENIED "???????? ? ??????????" - #define ERR_VOL_ALREADY_ONLINE "??? ??? ???????????" - #define ERR_NO_SUCH_DRIVE "??? ?????? ?????" - #define ERR_NOT_MAC_DISK "?? ???? Macintosh" - #define ERR_VOL_EXTERNAL_FS "??? ??????????? ??????? ???????? ???????" - #define ERR_PROBLEM_RENAME "???????? ??? ??????????????" - #define ERR_BAD_MASTER_BLOCK "?????? ??????? ???? ????????" - #define ERR_CANT_MOVE_FORBIDDEN "??????? ??????????? ?????????" - #define ERR_WRONG_VOL_TYPE "???????? ??? ????" - #define ERR_SERVER_VOL_LOST "????????? ??? ??? ??????????" - #define ERR_FILE_ID_NOT_FOUND "????????????? ????? ?? ??????" - #define ERR_FILE_ID_EXISTS "????????????? ????? ??? ??????????" - #define ERR_SERVER_NO_RESPOND "?????? ?? ????????" - #define ERR_USER_AUTH_FAILED "????????????? ???????????? ?? ???????" - #define ERR_PWORD_EXPIRED "?????? ?? ??????? ???????" - #define ERR_ACCESS_DENIED "???????? ? ???????" - #define ERR_NOT_A_DOS_DISK "?? ???? DOS" - #define ERR_SHARING_VIOLATION "????????? ??????????? ???????" - #define ERR_CANNOT_MAKE "?? ???? ???????" - #define ERR_DEV_IN_USE "?????????? ??? ????????????" - #define ERR_OPEN_FAILED "???????? ?? ???????" - #define ERR_PIPE_BUSY "???????? ?????" - #define ERR_SHARING_BUF_EXCEEDED "??????????? ????? ??????????" - #define ERR_TOO_MANY_HANDLES "??????? ????? ???????? ????????????" - #define ERR_SEEK_ERROR "?????? ????????????????" - #define ERR_DEL_CWD "??????? ??????? ??????? ??????? ???????" - #define ERR_WRITE_PROTECT_ERROR "?????? ?????? ??????" - #define ERR_WRITE_FAULT "?????? ??????" - #define ERR_LOCK_VIOLATION "????????? ??????????" - #define ERR_GEN_FAILURE "????? ????" - #define ERR_UNCERTAIN_MEDIA "?????????????? ????????" - #define ERR_PROT_VIOLATION "????????? ??????" - #define ERR_BROKEN_PIPE "????????? ????????" - -#elif (PHYSFS_LANG == PHYSFS_LANG_RUSSIAN_CP866) - #define DIR_ARCHIVE_DESCRIPTION "?? ?????, ???????????????? ????/????? ???????? ???????" - #define GRP_ARCHIVE_DESCRIPTION "?????? ?????????? ????? Build engine" - #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format" - #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format" - #define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip ???????????" - #define WAD_ARCHIVE_DESCRIPTION "DOOM engine format" /* !!! FIXME: translate this line if needed */ - #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ - - #define ERR_IS_INITIALIZED "??? ???????????????" - #define ERR_NOT_INITIALIZED "?? ???????????????" - #define ERR_INVALID_ARGUMENT "???????? ????????" - #define ERR_FILES_STILL_OPEN "????? ??? ???????" - #define ERR_NO_DIR_CREATE "?? ???? ??????? ????????" - #define ERR_OUT_OF_MEMORY "????????? ??????" - #define ERR_NOT_IN_SEARCH_PATH "??? ?????? ???????? ? ???? ??????" - #define ERR_NOT_SUPPORTED "???????? ?? ??????????????" - #define ERR_UNSUPPORTED_ARCHIVE "?????? ?????? ???? ?? ??????????????" - #define ERR_NOT_A_HANDLE "?? ???????? ??????????" - #define ERR_INSECURE_FNAME "???????????? ??? ?????" - #define ERR_SYMLINK_DISALLOWED "?????????? ?????? ?????????" - #define ERR_NO_WRITE_DIR "??????? ??? ?????? ?? ??????????" - #define ERR_NO_SUCH_FILE "???? ?? ??????" - #define ERR_NO_SUCH_PATH "???? ?? ??????" - #define ERR_NO_SUCH_VOLUME "??? ?? ??????" - #define ERR_PAST_EOF "?? ?????? ?????" - #define ERR_ARC_IS_READ_ONLY "????? ?????? ??? ??????" - #define ERR_IO_ERROR "?????? ?????/??????" - #define ERR_CANT_SET_WRITE_DIR "?? ???? ?????????? ??????? ??? ??????" - #define ERR_SYMLINK_LOOP "??????????? ???? ?????????? ??????" - #define ERR_COMPRESSION "?????? (???)???????" - #define ERR_NOT_IMPLEMENTED "?? ???????????" - #define ERR_OS_ERROR "???????????? ??????? ???????? ??????" - #define ERR_FILE_EXISTS "???? ??? ??????????" - #define ERR_NOT_A_FILE "?? ????" - #define ERR_NOT_A_DIR "?? ???????" - #define ERR_NOT_AN_ARCHIVE "?? ?????" - #define ERR_CORRUPTED "???????????? ?????" - #define ERR_SEEK_OUT_OF_RANGE "???????????????? ?? ???????" - #define ERR_BAD_FILENAME "???????? ??? ?????" - #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS ????????? ???????? ????????? ?????" - #define ERR_ARGV0_IS_NULL "argv0 is NULL" - #define ERR_NEED_DICT "????? ???????" - #define ERR_DATA_ERROR "?????? ??????" - #define ERR_MEMORY_ERROR "?????? ??????" - #define ERR_BUFFER_ERROR "?????? ??????" - #define ERR_VERSION_ERROR "?????? ??????" - #define ERR_UNKNOWN_ERROR "??????????? ??????" - #define ERR_SEARCHPATH_TRUNC "???? ?????? ???????" - #define ERR_GETMODFN_TRUNC "GetModuleFileName() ???????" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() ?? ??????? ???????" - #define ERR_DISK_FULL "???? ?????" - #define ERR_DIRECTORY_FULL "??????? ?????" - #define ERR_MACOS_GENERIC "MacOS ???????? ?????? (%d)" - #define ERR_OS2_GENERIC "OS/2 ???????? ?????? (%d)" - #define ERR_VOL_LOCKED_HW "??? ?????????? ?????????" - #define ERR_VOL_LOCKED_SW "??? ?????????? ??????????" - #define ERR_FILE_LOCKED "???? ????????????" - #define ERR_FILE_OR_DIR_BUSY "????/??????? ?????" - #define ERR_FILE_ALREADY_OPEN_W "???? ??? ?????? ?? ??????" - #define ERR_FILE_ALREADY_OPEN_R "???? ??? ?????? ?? ??????" - #define ERR_INVALID_REFNUM "???????? ?????????? ??????" - #define ERR_GETTING_FILE_POS "?????? ??? ????????? ??????? ?????" - #define ERR_VOLUME_OFFLINE "??? ??????????" - #define ERR_PERMISSION_DENIED "???????? ? ??????????" - #define ERR_VOL_ALREADY_ONLINE "??? ??? ???????????" - #define ERR_NO_SUCH_DRIVE "??? ?????? ?????" - #define ERR_NOT_MAC_DISK "?? ???? Macintosh" - #define ERR_VOL_EXTERNAL_FS "??? ??????????? ??????? ???????? ???????" - #define ERR_PROBLEM_RENAME "???????? ??? ??????????????" - #define ERR_BAD_MASTER_BLOCK "?????? ??????? ???? ????????" - #define ERR_CANT_MOVE_FORBIDDEN "??????? ??????????? ?????????" - #define ERR_WRONG_VOL_TYPE "???????? ??? ????" - #define ERR_SERVER_VOL_LOST "????????? ??? ??? ??????????" - #define ERR_FILE_ID_NOT_FOUND "????????????? ????? ?? ??????" - #define ERR_FILE_ID_EXISTS "????????????? ????? ??? ??????????" - #define ERR_SERVER_NO_RESPOND "?????? ?? ????????" - #define ERR_USER_AUTH_FAILED "????????????? ???????????? ?? ???????" - #define ERR_PWORD_EXPIRED "?????? ?? ??????? ???????" - #define ERR_ACCESS_DENIED "???????? ? ???????" - #define ERR_NOT_A_DOS_DISK "?? ???? DOS" - #define ERR_SHARING_VIOLATION "????????? ??????????? ???????" - #define ERR_CANNOT_MAKE "?? ???? ???????" - #define ERR_DEV_IN_USE "?????????? ??? ????????????" - #define ERR_OPEN_FAILED "???????? ?? ???????" - #define ERR_PIPE_BUSY "???????? ?????" - #define ERR_SHARING_BUF_EXCEEDED "??????????? ????? ??????????" - #define ERR_TOO_MANY_HANDLES "??????? ????? ???????? ????????????" - #define ERR_SEEK_ERROR "?????? ????????????????" - #define ERR_DEL_CWD "??????? ??????? ??????? ??????? ???????" - #define ERR_WRITE_PROTECT_ERROR "?????? ?????? ??????" - #define ERR_WRITE_FAULT "?????? ??????" - #define ERR_LOCK_VIOLATION "????????? ??????????" - #define ERR_GEN_FAILURE "????? ????" - #define ERR_UNCERTAIN_MEDIA "?????????????? ????????" - #define ERR_PROT_VIOLATION "????????? ??????" - #define ERR_BROKEN_PIPE "????????? ????????" - -#elif (PHYSFS_LANG == PHYSFS_LANG_RUSSIAN_ISO_8859_5) - #define DIR_ARCHIVE_DESCRIPTION "?? ?????, ???????????????? ????/????? ???????? ???????" - #define GRP_ARCHIVE_DESCRIPTION "?????? ?????????? ????? Build engine" - #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format" - #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format" - #define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip ???????????" - #define WAD_ARCHIVE_DESCRIPTION "DOOM engine format" /* !!! FIXME: translate this line if needed */ - #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ - - #define ERR_IS_INITIALIZED "??? ???????????????" - #define ERR_NOT_INITIALIZED "?? ???????????????" - #define ERR_INVALID_ARGUMENT "???????? ????????" - #define ERR_FILES_STILL_OPEN "????? ??? ???????" - #define ERR_NO_DIR_CREATE "?? ???? ??????? ????????" - #define ERR_OUT_OF_MEMORY "????????? ??????" - #define ERR_NOT_IN_SEARCH_PATH "??? ?????? ???????? ? ???? ??????" - #define ERR_NOT_SUPPORTED "???????? ?? ??????????????" - #define ERR_UNSUPPORTED_ARCHIVE "?????? ?????? ???? ?? ??????????????" - #define ERR_NOT_A_HANDLE "?? ???????? ??????????" - #define ERR_INSECURE_FNAME "???????????? ??? ?????" - #define ERR_SYMLINK_DISALLOWED "?????????? ?????? ?????????" - #define ERR_NO_WRITE_DIR "??????? ??? ?????? ?? ??????????" - #define ERR_NO_SUCH_FILE "???? ?? ??????" - #define ERR_NO_SUCH_PATH "???? ?? ??????" - #define ERR_NO_SUCH_VOLUME "??? ?? ??????" - #define ERR_PAST_EOF "?? ?????? ?????" - #define ERR_ARC_IS_READ_ONLY "????? ?????? ??? ??????" - #define ERR_IO_ERROR "?????? ?????/??????" - #define ERR_CANT_SET_WRITE_DIR "?? ???? ?????????? ??????? ??? ??????" - #define ERR_SYMLINK_LOOP "??????????? ???? ?????????? ??????" - #define ERR_COMPRESSION "?????? (???)???????" - #define ERR_NOT_IMPLEMENTED "?? ???????????" - #define ERR_OS_ERROR "???????????? ??????? ???????? ??????" - #define ERR_FILE_EXISTS "???? ??? ??????????" - #define ERR_NOT_A_FILE "?? ????" - #define ERR_NOT_A_DIR "?? ???????" - #define ERR_NOT_AN_ARCHIVE "?? ?????" - #define ERR_CORRUPTED "???????????? ?????" - #define ERR_SEEK_OUT_OF_RANGE "???????????????? ?? ???????" - #define ERR_BAD_FILENAME "???????? ??? ?????" - #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS ????????? ???????? ????????? ?????" - #define ERR_ARGV0_IS_NULL "argv0 is NULL" - #define ERR_NEED_DICT "????? ???????" - #define ERR_DATA_ERROR "?????? ??????" - #define ERR_MEMORY_ERROR "?????? ??????" - #define ERR_BUFFER_ERROR "?????? ??????" - #define ERR_VERSION_ERROR "?????? ??????" - #define ERR_UNKNOWN_ERROR "??????????? ??????" - #define ERR_SEARCHPATH_TRUNC "???? ?????? ???????" - #define ERR_GETMODFN_TRUNC "GetModuleFileName() ???????" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() ?? ??????? ???????" - #define ERR_DISK_FULL "???? ?????" - #define ERR_DIRECTORY_FULL "??????? ?????" - #define ERR_MACOS_GENERIC "MacOS ???????? ?????? (%d)" - #define ERR_OS2_GENERIC "OS/2 ???????? ?????? (%d)" - #define ERR_VOL_LOCKED_HW "??? ?????????? ?????????" - #define ERR_VOL_LOCKED_SW "??? ?????????? ??????????" - #define ERR_FILE_LOCKED "???? ????????????" - #define ERR_FILE_OR_DIR_BUSY "????/??????? ?????" - #define ERR_FILE_ALREADY_OPEN_W "???? ??? ?????? ?? ??????" - #define ERR_FILE_ALREADY_OPEN_R "???? ??? ?????? ?? ??????" - #define ERR_INVALID_REFNUM "???????? ?????????? ??????" - #define ERR_GETTING_FILE_POS "?????? ??? ????????? ??????? ?????" - #define ERR_VOLUME_OFFLINE "??? ??????????" - #define ERR_PERMISSION_DENIED "???????? ? ??????????" - #define ERR_VOL_ALREADY_ONLINE "??? ??? ???????????" - #define ERR_NO_SUCH_DRIVE "??? ?????? ?????" - #define ERR_NOT_MAC_DISK "?? ???? Macintosh" - #define ERR_VOL_EXTERNAL_FS "??? ??????????? ??????? ???????? ???????" - #define ERR_PROBLEM_RENAME "???????? ??? ??????????????" - #define ERR_BAD_MASTER_BLOCK "?????? ??????? ???? ????????" - #define ERR_CANT_MOVE_FORBIDDEN "??????? ??????????? ?????????" - #define ERR_WRONG_VOL_TYPE "???????? ??? ????" - #define ERR_SERVER_VOL_LOST "????????? ??? ??? ??????????" - #define ERR_FILE_ID_NOT_FOUND "????????????? ????? ?? ??????" - #define ERR_FILE_ID_EXISTS "????????????? ????? ??? ??????????" - #define ERR_SERVER_NO_RESPOND "?????? ?? ????????" - #define ERR_USER_AUTH_FAILED "????????????? ???????????? ?? ???????" - #define ERR_PWORD_EXPIRED "?????? ?? ??????? ???????" - #define ERR_ACCESS_DENIED "???????? ? ???????" - #define ERR_NOT_A_DOS_DISK "?? ???? DOS" - #define ERR_SHARING_VIOLATION "????????? ??????????? ???????" - #define ERR_CANNOT_MAKE "?? ???? ???????" - #define ERR_DEV_IN_USE "?????????? ??? ????????????" - #define ERR_OPEN_FAILED "???????? ?? ???????" - #define ERR_PIPE_BUSY "???????? ?????" - #define ERR_SHARING_BUF_EXCEEDED "??????????? ????? ??????????" - #define ERR_TOO_MANY_HANDLES "??????? ????? ???????? ????????????" - #define ERR_SEEK_ERROR "?????? ????????????????" - #define ERR_DEL_CWD "??????? ??????? ??????? ??????? ???????" - #define ERR_WRITE_PROTECT_ERROR "?????? ?????? ??????" - #define ERR_WRITE_FAULT "?????? ??????" - #define ERR_LOCK_VIOLATION "????????? ??????????" - #define ERR_GEN_FAILURE "????? ????" - #define ERR_UNCERTAIN_MEDIA "?????????????? ????????" - #define ERR_PROT_VIOLATION "????????? ??????" - #define ERR_BROKEN_PIPE "????????? ????????" - - #elif (PHYSFS_LANG == PHYSFS_LANG_FRENCH) - #define DIR_ARCHIVE_DESCRIPTION "Pas d'archive, E/S directes sur syst?me de fichiers" + #define DIR_ARCHIVE_DESCRIPTION "Pas d'archive, E/S directes sur syst??me de fichiers" #define GRP_ARCHIVE_DESCRIPTION "Format Groupfile du moteur Build" #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format" #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format" @@ -689,193 +393,193 @@ #define WAD_ARCHIVE_DESCRIPTION "Format WAD du moteur DOOM" #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ - #define ERR_IS_INITIALIZED "D?j? initialis?" - #define ERR_NOT_INITIALIZED "Non initialis?" + #define ERR_IS_INITIALIZED "D??j?? initialis??" + #define ERR_NOT_INITIALIZED "Non initialis??" #define ERR_INVALID_ARGUMENT "Argument invalide" #define ERR_FILES_STILL_OPEN "Fichiers encore ouverts" - #define ERR_NO_DIR_CREATE "Echec de la cr?ation de r?pertoires" - #define ERR_OUT_OF_MEMORY "A court de m?moire" - #define ERR_NOT_IN_SEARCH_PATH "Aucune entr?e dans le chemin de recherche" - #define ERR_NOT_SUPPORTED "Op?ration non support?e" - #define ERR_UNSUPPORTED_ARCHIVE "Type d'archive non support?e" + #define ERR_NO_DIR_CREATE "Echec de la cr??ation de r??pertoires" + #define ERR_OUT_OF_MEMORY "A court de m??moire" + #define ERR_NOT_IN_SEARCH_PATH "Aucune entr??e dans le chemin de recherche" + #define ERR_NOT_SUPPORTED "Op??ration non support??e" + #define ERR_UNSUPPORTED_ARCHIVE "Type d'archive non support??e" #define ERR_NOT_A_HANDLE "Pas un descripteur de fichier" #define ERR_INSECURE_FNAME "Nom de fichier dangereux" - #define ERR_SYMLINK_DISALLOWED "Les liens symboliques sont d?sactiv?s" - #define ERR_NO_WRITE_DIR "Le r?pertoire d'?criture n'est pas sp?cifi?" - #define ERR_NO_SUCH_FILE "Fichier non trouv?" - #define ERR_NO_SUCH_PATH "Chemin non trouv?" - #define ERR_NO_SUCH_VOLUME "Volume non trouv?" - #define ERR_PAST_EOF "Au-del? de la fin du fichier" + #define ERR_SYMLINK_DISALLOWED "Les liens symboliques sont d??sactiv??s" + #define ERR_NO_WRITE_DIR "Le r??pertoire d'??criture n'est pas sp??cifi??" + #define ERR_NO_SUCH_FILE "Fichier non trouv??" + #define ERR_NO_SUCH_PATH "Chemin non trouv??" + #define ERR_NO_SUCH_VOLUME "Volume non trouv??" + #define ERR_PAST_EOF "Au-del?? de la fin du fichier" #define ERR_ARC_IS_READ_ONLY "L'archive est en lecture seule" #define ERR_IO_ERROR "Erreur E/S" - #define ERR_CANT_SET_WRITE_DIR "Ne peut utiliser le r?pertoire d'?criture" + #define ERR_CANT_SET_WRITE_DIR "Ne peut utiliser le r??pertoire d'??criture" #define ERR_SYMLINK_LOOP "Boucle infinie dans les liens symboliques" - #define ERR_COMPRESSION "Erreur de (d?)compression" - #define ERR_NOT_IMPLEMENTED "Non impl?ment?" - #define ERR_OS_ERROR "Erreur rapport?e par le syst?me d'exploitation" - #define ERR_FILE_EXISTS "Le fichier existe d?j?" + #define ERR_COMPRESSION "Erreur de (d??)compression" + #define ERR_NOT_IMPLEMENTED "Non impl??ment??" + #define ERR_OS_ERROR "Erreur rapport??e par le syst??me d'exploitation" + #define ERR_FILE_EXISTS "Le fichier existe d??j??" #define ERR_NOT_A_FILE "Pas un fichier" - #define ERR_NOT_A_DIR "Pas un r?pertoire" + #define ERR_NOT_A_DIR "Pas un r??pertoire" #define ERR_NOT_AN_ARCHIVE "Pas une archive" #define ERR_CORRUPTED "Archive corrompue" - #define ERR_SEEK_OUT_OF_RANGE "Pointeur de fichier hors de port?e" + #define ERR_SEEK_OUT_OF_RANGE "Pointeur de fichier hors de port??e" #define ERR_BAD_FILENAME "Mauvais nom de fichier" - #define ERR_PHYSFS_BAD_OS_CALL "(BOGUE) PhysicsFS a fait un mauvais appel syst?me, le salaud" + #define ERR_PHYSFS_BAD_OS_CALL "(BOGUE) PhysicsFS a fait un mauvais appel syst??me, le salaud" #define ERR_ARGV0_IS_NULL "argv0 est NULL" #define ERR_NEED_DICT "a besoin du dico" - #define ERR_DATA_ERROR "erreur de donn?es" - #define ERR_MEMORY_ERROR "erreur m?moire" + #define ERR_DATA_ERROR "erreur de donn??es" + #define ERR_MEMORY_ERROR "erreur m??moire" #define ERR_BUFFER_ERROR "erreur tampon" #define ERR_VERSION_ERROR "erreur de version" #define ERR_UNKNOWN_ERROR "erreur inconnue" - #define ERR_SEARCHPATH_TRUNC "Le chemin de recherche a ?t? tronqu?" - #define ERR_GETMODFN_TRUNC "GetModuleFileName() a ?t? tronqu?" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() n'a pas de r?pertoire" + #define ERR_SEARCHPATH_TRUNC "Le chemin de recherche a ??t?? tronqu??" + #define ERR_GETMODFN_TRUNC "GetModuleFileName() a ??t?? tronqu??" + #define ERR_GETMODFN_NO_DIR "GetModuleFileName() n'a pas de r??pertoire" #define ERR_DISK_FULL "Disque plein" - #define ERR_DIRECTORY_FULL "R?pertoire plein" - #define ERR_MACOS_GENERIC "Erreur rapport?e par MacOS (%d)" - #define ERR_OS2_GENERIC "Erreur rapport?e par OS/2 (%d)" - #define ERR_VOL_LOCKED_HW "Le volume est verrouill? mat?riellement" - #define ERR_VOL_LOCKED_SW "Le volume est verrouill? par logiciel" - #define ERR_FILE_LOCKED "Fichier verrouill?" - #define ERR_FILE_OR_DIR_BUSY "Fichier/r?pertoire occup?" - #define ERR_FILE_ALREADY_OPEN_W "Fichier d?j? ouvert en ?criture" - #define ERR_FILE_ALREADY_OPEN_R "Fichier d?j? ouvert en lecture" - #define ERR_INVALID_REFNUM "Num?ro de r?f?rence invalide" + #define ERR_DIRECTORY_FULL "R??pertoire plein" + #define ERR_MACOS_GENERIC "Erreur rapport??e par MacOS (%d)" + #define ERR_OS2_GENERIC "Erreur rapport??e par OS/2 (%d)" + #define ERR_VOL_LOCKED_HW "Le volume est verrouill?? mat??riellement" + #define ERR_VOL_LOCKED_SW "Le volume est verrouill?? par logiciel" + #define ERR_FILE_LOCKED "Fichier verrouill??" + #define ERR_FILE_OR_DIR_BUSY "Fichier/r??pertoire occup??" + #define ERR_FILE_ALREADY_OPEN_W "Fichier d??j?? ouvert en ??criture" + #define ERR_FILE_ALREADY_OPEN_R "Fichier d??j?? ouvert en lecture" + #define ERR_INVALID_REFNUM "Num??ro de r??f??rence invalide" #define ERR_GETTING_FILE_POS "Erreur lors de l'obtention de la position du pointeur de fichier" #define ERR_VOLUME_OFFLINE "Le volume n'est pas en ligne" - #define ERR_PERMISSION_DENIED "Permission refus?e" - #define ERR_VOL_ALREADY_ONLINE "Volum? d?j? en ligne" + #define ERR_PERMISSION_DENIED "Permission refus??e" + #define ERR_VOL_ALREADY_ONLINE "Volum?? d??j?? en ligne" #define ERR_NO_SUCH_DRIVE "Lecteur inexistant" #define ERR_NOT_MAC_DISK "Pas un disque Macintosh" - #define ERR_VOL_EXTERNAL_FS "Le volume appartient ? un syst?me de fichiers externe" - #define ERR_PROBLEM_RENAME "Probl?me lors du renommage" - #define ERR_BAD_MASTER_BLOCK "Mauvais block maitre de r?pertoire" - #define ERR_CANT_MOVE_FORBIDDEN "Essai de d?placement interdit" + #define ERR_VOL_EXTERNAL_FS "Le volume appartient ?? un syst??me de fichiers externe" + #define ERR_PROBLEM_RENAME "Probl??me lors du renommage" + #define ERR_BAD_MASTER_BLOCK "Mauvais block maitre de r??pertoire" + #define ERR_CANT_MOVE_FORBIDDEN "Essai de d??placement interdit" #define ERR_WRONG_VOL_TYPE "Mauvais type de volume" - #define ERR_SERVER_VOL_LOST "Le volume serveur a ?t? d?connect?" - #define ERR_FILE_ID_NOT_FOUND "Identificateur de fichier non trouv?" - #define ERR_FILE_ID_EXISTS "Identificateur de fichier existe d?j?" - #define ERR_SERVER_NO_RESPOND "Le serveur ne r?pond pas" - #define ERR_USER_AUTH_FAILED "Authentification de l'utilisateur ?chou?e" - #define ERR_PWORD_EXPIRED "Le mot de passe a expir? sur le serveur" - #define ERR_ACCESS_DENIED "Acc?s refus?" + #define ERR_SERVER_VOL_LOST "Le volume serveur a ??t?? d??connect??" + #define ERR_FILE_ID_NOT_FOUND "Identificateur de fichier non trouv??" + #define ERR_FILE_ID_EXISTS "Identificateur de fichier existe d??j??" + #define ERR_SERVER_NO_RESPOND "Le serveur ne r??pond pas" + #define ERR_USER_AUTH_FAILED "Authentification de l'utilisateur ??chou??e" + #define ERR_PWORD_EXPIRED "Le mot de passe a expir?? sur le serveur" + #define ERR_ACCESS_DENIED "Acc??s refus??" #define ERR_NOT_A_DOS_DISK "Pas un disque DOS" #define ERR_SHARING_VIOLATION "Violation de partage" #define ERR_CANNOT_MAKE "Ne peut faire" - #define ERR_DEV_IN_USE "P?riph?rique d?j? en utilisation" - #define ERR_OPEN_FAILED "Ouverture ?chou?e" - #define ERR_PIPE_BUSY "Le tube est occup?" - #define ERR_SHARING_BUF_EXCEEDED "Tampon de partage d?pass?" + #define ERR_DEV_IN_USE "P??riph??rique d??j?? en utilisation" + #define ERR_OPEN_FAILED "Ouverture ??chou??e" + #define ERR_PIPE_BUSY "Le tube est occup??" + #define ERR_SHARING_BUF_EXCEEDED "Tampon de partage d??pass??" #define ERR_TOO_MANY_HANDLES "Trop de descripteurs ouverts" #define ERR_SEEK_ERROR "Erreur de positionement" - #define ERR_DEL_CWD "Essai de supprimer le r?pertoire courant" - #define ERR_WRITE_PROTECT_ERROR "Erreur de protection en ?criture" - #define ERR_WRITE_FAULT "Erreur d'?criture" + #define ERR_DEL_CWD "Essai de supprimer le r??pertoire courant" + #define ERR_WRITE_PROTECT_ERROR "Erreur de protection en ??criture" + #define ERR_WRITE_FAULT "Erreur d'??criture" #define ERR_LOCK_VIOLATION "Violation de verrou" - #define ERR_GEN_FAILURE "Echec g?n?ral" - #define ERR_UNCERTAIN_MEDIA "M?dia incertain" + #define ERR_GEN_FAILURE "Echec g??n??ral" + #define ERR_UNCERTAIN_MEDIA "M??dia incertain" #define ERR_PROT_VIOLATION "Violation de protection" - #define ERR_BROKEN_PIPE "Tube cass?" + #define ERR_BROKEN_PIPE "Tube cass??" #elif (PHYSFS_LANG == PHYSFS_LANG_PORTUGUESE_BR) - #define DIR_ARCHIVE_DESCRIPTION "N?o arquivo, E/S sistema de arquivos direto" + #define DIR_ARCHIVE_DESCRIPTION "N??o arquivo, E/S sistema de arquivos direto" #define GRP_ARCHIVE_DESCRIPTION "Formato Groupfile do engine Build" #define HOG_ARCHIVE_DESCRIPTION "Formato Descent I/II HOG file" #define MVL_ARCHIVE_DESCRIPTION "Formato Descent II Movielib" #define QPAK_ARCHIVE_DESCRIPTION "Formato Quake I/II" - #define ZIP_ARCHIVE_DESCRIPTION "Formato compat?vel PkZip/WinZip/Info-Zip" + #define ZIP_ARCHIVE_DESCRIPTION "Formato compat??vel PkZip/WinZip/Info-Zip" #define WAD_ARCHIVE_DESCRIPTION "Formato WAD do engine DOOM" #define WAD_ARCHIVE_DESCRIPTION "DOOM engine format" /* !!! FIXME: translate this line if needed */ #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ - #define ERR_IS_INITIALIZED "J? inicializado" - #define ERR_NOT_INITIALIZED "N?o inicializado" - #define ERR_INVALID_ARGUMENT "Argumento inv?lido" + #define ERR_IS_INITIALIZED "J?? inicializado" + #define ERR_NOT_INITIALIZED "N??o inicializado" + #define ERR_INVALID_ARGUMENT "Argumento inv??lido" #define ERR_FILES_STILL_OPEN "Arquivos ainda abertos" - #define ERR_NO_DIR_CREATE "Falha na cria??o de diret?rios" - #define ERR_OUT_OF_MEMORY "Mem?ria insuficiente" - #define ERR_NOT_IN_SEARCH_PATH "Entrada n?o encontrada no caminho de busca" - #define ERR_NOT_SUPPORTED "Opera??o n?o suportada" - #define ERR_UNSUPPORTED_ARCHIVE "Tipo de arquivo n?o suportado" - #define ERR_NOT_A_HANDLE "N?o ? um handler de arquivo" + #define ERR_NO_DIR_CREATE "Falha na cria????o de diret??rios" + #define ERR_OUT_OF_MEMORY "Mem??ria insuficiente" + #define ERR_NOT_IN_SEARCH_PATH "Entrada n??o encontrada no caminho de busca" + #define ERR_NOT_SUPPORTED "Opera????o n??o suportada" + #define ERR_UNSUPPORTED_ARCHIVE "Tipo de arquivo n??o suportado" + #define ERR_NOT_A_HANDLE "N??o ?? um handler de arquivo" #define ERR_INSECURE_FNAME "Nome de arquivo inseguro" - #define ERR_SYMLINK_DISALLOWED "Links simb?licos desabilitados" - #define ERR_NO_WRITE_DIR "Diret?rio de escrita n?o definido" - #define ERR_NO_SUCH_FILE "Arquivo n?o encontrado" - #define ERR_NO_SUCH_PATH "Caminho n?o encontrado" - #define ERR_NO_SUCH_VOLUME "Volume n?o encontrado" + #define ERR_SYMLINK_DISALLOWED "Links simb??licos desabilitados" + #define ERR_NO_WRITE_DIR "Diret??rio de escrita n??o definido" + #define ERR_NO_SUCH_FILE "Arquivo n??o encontrado" + #define ERR_NO_SUCH_PATH "Caminho n??o encontrado" + #define ERR_NO_SUCH_VOLUME "Volume n??o encontrado" #define ERR_PAST_EOF "Passou o fim do arquivo" - #define ERR_ARC_IS_READ_ONLY "Arquivo ? somente de leitura" + #define ERR_ARC_IS_READ_ONLY "Arquivo ?? somente de leitura" #define ERR_IO_ERROR "Erro de E/S" - #define ERR_CANT_SET_WRITE_DIR "N?o foi poss?vel definir diret?rio de escrita" - #define ERR_SYMLINK_LOOP "Loop infinito de link simb?lico" - #define ERR_COMPRESSION "Erro de (Des)compress?o" - #define ERR_NOT_IMPLEMENTED "N?o implementado" + #define ERR_CANT_SET_WRITE_DIR "N??o foi poss??vel definir diret??rio de escrita" + #define ERR_SYMLINK_LOOP "Loop infinito de link simb??lico" + #define ERR_COMPRESSION "Erro de (Des)compress??o" + #define ERR_NOT_IMPLEMENTED "N??o implementado" #define ERR_OS_ERROR "Erro reportado pelo Sistema Operacional" - #define ERR_FILE_EXISTS "Arquivo j? existente" - #define ERR_NOT_A_FILE "N?o ? um arquivo" - #define ERR_NOT_A_DIR "N?o ? um diret?rio" - #define ERR_NOT_AN_ARCHIVE "N?o ? um pacote" + #define ERR_FILE_EXISTS "Arquivo j?? existente" + #define ERR_NOT_A_FILE "N??o ?? um arquivo" + #define ERR_NOT_A_DIR "N??o ?? um diret??rio" + #define ERR_NOT_AN_ARCHIVE "N??o ?? um pacote" #define ERR_CORRUPTED "Pacote corrompido" - #define ERR_SEEK_OUT_OF_RANGE "Posicionamento al?m do tamanho" - #define ERR_BAD_FILENAME "Nome de arquivo inv?lido" - #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS realizou uma chamada de sistema inv?lida" - #define ERR_ARGV0_IS_NULL "argv0 ? NULL" - #define ERR_NEED_DICT "precisa de diret?rio" + #define ERR_SEEK_OUT_OF_RANGE "Posicionamento al??m do tamanho" + #define ERR_BAD_FILENAME "Nome de arquivo inv??lido" + #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS realizou uma chamada de sistema inv??lida" + #define ERR_ARGV0_IS_NULL "argv0 ?? NULL" + #define ERR_NEED_DICT "precisa de diret??rio" #define ERR_DATA_ERROR "erro nos dados" - #define ERR_MEMORY_ERROR "erro de mem?ria" + #define ERR_MEMORY_ERROR "erro de mem??ria" #define ERR_BUFFER_ERROR "erro de buffer" #define ERR_VERSION_ERROR "erro na version" #define ERR_UNKNOWN_ERROR "erro desconhecido" #define ERR_SEARCHPATH_TRUNC "Caminho de procura quebrado" #define ERR_GETMODFN_TRUNC "GetModuleFileName() foi quebrado" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() nao teve diret?rio" + #define ERR_GETMODFN_NO_DIR "GetModuleFileName() nao teve diret??rio" #define ERR_DISK_FULL "Disco cheio" - #define ERR_DIRECTORY_FULL "Diret?rio cheio" + #define ERR_DIRECTORY_FULL "Diret??rio cheio" #define ERR_MACOS_GENERIC "MacOS reportou um erro (%d)" #define ERR_OS2_GENERIC "OS/2 reportou um erro (%d)" #define ERR_VOL_LOCKED_HW "Volume travado por hardware" #define ERR_VOL_LOCKED_SW "Volume travado por software" #define ERR_FILE_LOCKED "Arquivo travado" - #define ERR_FILE_OR_DIR_BUSY "Arquivo/Diret?rio est? em uso" - #define ERR_FILE_ALREADY_OPEN_W "Arquivo j? aberto para escrita" - #define ERR_FILE_ALREADY_OPEN_R "Arquivo j? aberto para leitura" - #define ERR_INVALID_REFNUM "N?mero de refer?ncia" - #define ERR_GETTING_FILE_POS "Erro ao tentar obter posi??o do arquivo" - #define ERR_VOLUME_OFFLINE "Volume est? indispon?vel" - #define ERR_PERMISSION_DENIED "Permiss?o negada" - #define ERR_VOL_ALREADY_ONLINE "Volume dispon?vel" + #define ERR_FILE_OR_DIR_BUSY "Arquivo/Diret??rio est?? em uso" + #define ERR_FILE_ALREADY_OPEN_W "Arquivo j?? aberto para escrita" + #define ERR_FILE_ALREADY_OPEN_R "Arquivo j?? aberto para leitura" + #define ERR_INVALID_REFNUM "N??mero de refer??ncia" + #define ERR_GETTING_FILE_POS "Erro ao tentar obter posi????o do arquivo" + #define ERR_VOLUME_OFFLINE "Volume est?? indispon??vel" + #define ERR_PERMISSION_DENIED "Permiss??o negada" + #define ERR_VOL_ALREADY_ONLINE "Volume dispon??vel" #define ERR_NO_SUCH_DRIVE "Drive inexistente" - #define ERR_NOT_MAC_DISK "N?o ? um disco Macintosh" + #define ERR_NOT_MAC_DISK "N??o ?? um disco Macintosh" #define ERR_VOL_EXTERNAL_FS "Volume pertence a um sistema de arquivos externo" - #define ERR_PROBLEM_RENAME "Problema durante renomea??o" - #define ERR_BAD_MASTER_BLOCK "Bloco master do diret?rio inv?lido" + #define ERR_PROBLEM_RENAME "Problema durante renomea????o" + #define ERR_BAD_MASTER_BLOCK "Bloco master do diret??rio inv??lido" #define ERR_CANT_MOVE_FORBIDDEN "Tentativa de mover proibida" - #define ERR_WRONG_VOL_TYPE "Tipo inv?lido de volume" + #define ERR_WRONG_VOL_TYPE "Tipo inv??lido de volume" #define ERR_SERVER_VOL_LOST "Volume servidor desconectado" - #define ERR_FILE_ID_NOT_FOUND "ID de Arquivo n?o encontrado" - #define ERR_FILE_ID_EXISTS "ID de Arquivo j? existente" - #define ERR_SERVER_NO_RESPOND "Servidor n?o respondendo" - #define ERR_USER_AUTH_FAILED "Autentica??o de usu?rio falhada" + #define ERR_FILE_ID_NOT_FOUND "ID de Arquivo n??o encontrado" + #define ERR_FILE_ID_EXISTS "ID de Arquivo j?? existente" + #define ERR_SERVER_NO_RESPOND "Servidor n??o respondendo" + #define ERR_USER_AUTH_FAILED "Autentica????o de usu??rio falhada" #define ERR_PWORD_EXPIRED "Password foi expirada no servidor" #define ERR_ACCESS_DENIED "Accesso negado" - #define ERR_NOT_A_DOS_DISK "N?o ? um disco DOS" - #define ERR_SHARING_VIOLATION "Viola??o de compartilhamento" - #define ERR_CANNOT_MAKE "N?o pode ser feito" - #define ERR_DEV_IN_USE "Device j? em uso" + #define ERR_NOT_A_DOS_DISK "N??o ?? um disco DOS" + #define ERR_SHARING_VIOLATION "Viola????o de compartilhamento" + #define ERR_CANNOT_MAKE "N??o pode ser feito" + #define ERR_DEV_IN_USE "Device j?? em uso" #define ERR_OPEN_FAILED "Falaha na abertura" #define ERR_PIPE_BUSY "Fila ocupada" #define ERR_SHARING_BUF_EXCEEDED "Buffer de compartilhamento excedeu" #define ERR_TOO_MANY_HANDLES "Muitos handles abertos" #define ERR_SEEK_ERROR "Erro de posicionamento" - #define ERR_DEL_CWD "Tentando remover diret?rio de trabalho atual" - #define ERR_WRITE_PROTECT_ERROR "Erro de prote??o de escrita" + #define ERR_DEL_CWD "Tentando remover diret??rio de trabalho atual" + #define ERR_WRITE_PROTECT_ERROR "Erro de prote????o de escrita" #define ERR_WRITE_FAULT "Erro de escrita" - #define ERR_LOCK_VIOLATION "Viola??o de trava" + #define ERR_LOCK_VIOLATION "Viola????o de trava" #define ERR_GEN_FAILURE "Falha geral" #define ERR_UNCERTAIN_MEDIA "Media incerta" - #define ERR_PROT_VIOLATION "Viola??o de prote??o" + #define ERR_PROT_VIOLATION "Viola????o de prote????o" #define ERR_BROKEN_PIPE "Fila quebrada" #elif (PHYSFS_LANG == PHYSFS_LANG_SPANISH) @@ -889,27 +593,27 @@ #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ #define ERR_IS_INITIALIZED "Ya estaba inicializado" - #define ERR_NOT_INITIALIZED "No est? inicializado" - #define ERR_INVALID_ARGUMENT "Argumento inv?lido" - #define ERR_FILES_STILL_OPEN "Archivos a?n abiertos" + #define ERR_NOT_INITIALIZED "No est?? inicializado" + #define ERR_INVALID_ARGUMENT "Argumento inv??lido" + #define ERR_FILES_STILL_OPEN "Archivos a??n abiertos" #define ERR_NO_DIR_CREATE "Fallo al crear los directorios" #define ERR_OUT_OF_MEMORY "Memoria agotada" - #define ERR_NOT_IN_SEARCH_PATH "No existe tal entrada en la ruta de b?squeda" - #define ERR_NOT_SUPPORTED "Operaci?n no soportada" + #define ERR_NOT_IN_SEARCH_PATH "No existe tal entrada en la ruta de b??squeda" + #define ERR_NOT_SUPPORTED "Operaci??n no soportada" #define ERR_UNSUPPORTED_ARCHIVE "Tipo de archivo no soportado" #define ERR_NOT_A_HANDLE "No es un manejador de ficheo (file handle)" #define ERR_INSECURE_FNAME "Nombre de archivo inseguro" - #define ERR_SYMLINK_DISALLOWED "Los enlaces simb?licos est?n desactivados" + #define ERR_SYMLINK_DISALLOWED "Los enlaces simb??licos est??n desactivados" #define ERR_NO_WRITE_DIR "No has configurado un directorio de escritura" #define ERR_NO_SUCH_FILE "Archivo no encontrado" #define ERR_NO_SUCH_PATH "Ruta no encontrada" #define ERR_NO_SUCH_VOLUME "Volumen no encontrado" #define ERR_PAST_EOF "Te pasaste del final del archivo" - #define ERR_ARC_IS_READ_ONLY "El archivo es de s?lo lectura" + #define ERR_ARC_IS_READ_ONLY "El archivo es de s??lo lectura" #define ERR_IO_ERROR "Error E/S" #define ERR_CANT_SET_WRITE_DIR "No puedo configurar el directorio de escritura" - #define ERR_SYMLINK_LOOP "Bucle infnito de enlaces simb?licos" - #define ERR_COMPRESSION "Error de (des)compresi?n" + #define ERR_SYMLINK_LOOP "Bucle infnito de enlaces simb??licos" + #define ERR_COMPRESSION "Error de (des)compresi??n" #define ERR_NOT_IMPLEMENTED "No implementado" #define ERR_OS_ERROR "El sistema operativo ha devuelto un error" #define ERR_FILE_EXISTS "El archivo ya existe" @@ -917,7 +621,7 @@ #define ERR_NOT_A_DIR "No es un directorio" #define ERR_NOT_AN_ARCHIVE "No es un archivo" #define ERR_CORRUPTED "Archivo corrupto" - #define ERR_SEEK_OUT_OF_RANGE "B?squeda fuera de rango" + #define ERR_SEEK_OUT_OF_RANGE "B??squeda fuera de rango" #define ERR_BAD_FILENAME "Nombre de archivo incorrecto" #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS ha hecho una llamada incorrecta al sistema" #define ERR_ARGV0_IS_NULL "argv0 es NULL" @@ -925,24 +629,24 @@ #define ERR_DATA_ERROR "error de datos" #define ERR_MEMORY_ERROR "error de memoria" #define ERR_BUFFER_ERROR "error de buffer" - #define ERR_VERSION_ERROR "error de versi?n" + #define ERR_VERSION_ERROR "error de versi??n" #define ERR_UNKNOWN_ERROR "error desconocido" - #define ERR_SEARCHPATH_TRUNC "La ruta de b?squeda ha sido truncada" + #define ERR_SEARCHPATH_TRUNC "La ruta de b??squeda ha sido truncada" #define ERR_GETMODFN_TRUNC "GetModuleFileName() ha sido truncado" #define ERR_GETMODFN_NO_DIR "GetModuleFileName() no tenia directorio" - #define ERR_DISK_FULL "El disco est? lleno" - #define ERR_DIRECTORY_FULL "El directorio est? lleno" + #define ERR_DISK_FULL "El disco est?? lleno" + #define ERR_DIRECTORY_FULL "El directorio est?? lleno" #define ERR_MACOS_GENERIC "MacOS ha devuelto un error (%d)" #define ERR_OS2_GENERIC "OS/2 ha devuelto un error (%d)" - #define ERR_VOL_LOCKED_HW "El volumen est? bloqueado por el hardware" - #define ERR_VOL_LOCKED_SW "El volumen est? bloqueado por el software" - #define ERR_FILE_LOCKED "El archivo est? bloqueado" + #define ERR_VOL_LOCKED_HW "El volumen est?? bloqueado por el hardware" + #define ERR_VOL_LOCKED_SW "El volumen est?? bloqueado por el software" + #define ERR_FILE_LOCKED "El archivo est?? bloqueado" #define ERR_FILE_OR_DIR_BUSY "Fichero o directorio ocupados" #define ERR_FILE_ALREADY_OPEN_W "Fichero ya abierto para escritura" #define ERR_FILE_ALREADY_OPEN_R "Fichero ya abierto para lectura" - #define ERR_INVALID_REFNUM "El n?mero de referencia no es v?lido" - #define ERR_GETTING_FILE_POS "Error al tomar la posici?n del fichero" - #define ERR_VOLUME_OFFLINE "El volumen est? desconectado" + #define ERR_INVALID_REFNUM "El n??mero de referencia no es v??lido" + #define ERR_GETTING_FILE_POS "Error al tomar la posici??n del fichero" + #define ERR_VOLUME_OFFLINE "El volumen est?? desconectado" #define ERR_PERMISSION_DENIED "Permiso denegado" #define ERR_VOL_ALREADY_ONLINE "El volumen ya estaba conectado" #define ERR_NO_SUCH_DRIVE "No existe tal unidad" @@ -952,7 +656,7 @@ #define ERR_BAD_MASTER_BLOCK "Bloque maestro de directorios incorrecto" #define ERR_CANT_MOVE_FORBIDDEN "Intento de mover forbidden" #define ERR_WRONG_VOL_TYPE "Tipo de volumen incorrecto" - #define ERR_SERVER_VOL_LOST "El servidor de vol?menes ha sido desconectado" + #define ERR_SERVER_VOL_LOST "El servidor de vol??menes ha sido desconectado" #define ERR_FILE_ID_NOT_FOUND "Identificador de archivo no encontrado" #define ERR_FILE_ID_EXISTS "El identificador de archivo ya existe" #define ERR_SERVER_NO_RESPOND "El servidor no responde" @@ -960,22 +664,22 @@ #define ERR_PWORD_EXPIRED "La Password en el servidor ha caducado" #define ERR_ACCESS_DENIED "Acceso denegado" #define ERR_NOT_A_DOS_DISK "No es un disco de DOS" - #define ERR_SHARING_VIOLATION "Violaci?n al compartir" + #define ERR_SHARING_VIOLATION "Violaci??n al compartir" #define ERR_CANNOT_MAKE "No puedo hacer make" #define ERR_DEV_IN_USE "El dispositivo ya estaba en uso" #define ERR_OPEN_FAILED "Fallo al abrir" - #define ERR_PIPE_BUSY "Tuber?a ocupada" - #define ERR_SHARING_BUF_EXCEEDED "Buffer de compartici?n sobrepasado" + #define ERR_PIPE_BUSY "Tuber??a ocupada" + #define ERR_SHARING_BUF_EXCEEDED "Buffer de compartici??n sobrepasado" #define ERR_TOO_MANY_HANDLES "Demasiados manejadores (handles)" - #define ERR_SEEK_ERROR "Error de b?squeda" + #define ERR_SEEK_ERROR "Error de b??squeda" #define ERR_DEL_CWD "Intentando borrar el directorio de trabajo actual" - #define ERR_WRITE_PROTECT_ERROR "Error de protecci?n contra escritura" + #define ERR_WRITE_PROTECT_ERROR "Error de protecci??n contra escritura" #define ERR_WRITE_FAULT "Fallo al escribir" - #define ERR_LOCK_VIOLATION "Violaci?n del bloqueo" + #define ERR_LOCK_VIOLATION "Violaci??n del bloqueo" #define ERR_GEN_FAILURE "Fallo general" #define ERR_UNCERTAIN_MEDIA "Medio incierto" - #define ERR_PROT_VIOLATION "Violaci?n de la protecci?n" - #define ERR_BROKEN_PIPE "Tuber?a rota" + #define ERR_PROT_VIOLATION "Violaci??n de la protecci??n" + #define ERR_BROKEN_PIPE "Tuber??a rota" #else #error Please define PHYSFS_LANG. From DONOTREPLY at icculus.org Wed Mar 12 16:44:02 2008 From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org) Date: 12 Mar 2008 16:44:02 -0400 Subject: r935 - trunk Message-ID: <20080312204402.18987.qmail@icculus.org> Author: icculus Date: 2008-03-12 16:44:01 -0400 (Wed, 12 Mar 2008) New Revision: 935 Modified: trunk/CHANGELOG.txt Log: Updated. Modified: trunk/CHANGELOG.txt =================================================================== --- trunk/CHANGELOG.txt 2008-03-11 05:28:13 UTC (rev 934) +++ trunk/CHANGELOG.txt 2008-03-12 20:44:01 UTC (rev 935) @@ -2,7 +2,8 @@ * CHANGELOG. */ -03102008 - Changed some text files from ISO-8859-1 to UTF-8. +03102008 - Changed some text files from ISO-8859-1 to UTF-8. Replaced all the + translations with UTF-8 encoded equivalents. 03082008 - Fixed compiler warnings in Windows platform layer (thanks, Dennis!). 02202008 - Various archiver swap and compare functions now check if they are swapping/comparing an item against itself, for efficiency and From DONOTREPLY at icculus.org Wed Mar 12 17:21:41 2008 From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org) Date: 12 Mar 2008 17:21:41 -0400 Subject: r936 - in branches/stable-1.0: . platform Message-ID: <20080312212141.4221.qmail@icculus.org> Author: icculus Date: 2008-03-12 17:21:40 -0400 (Wed, 12 Mar 2008) New Revision: 936 Modified: branches/stable-1.0/CHANGELOG branches/stable-1.0/platform/win32.c Log: Removed a FIXME. Modified: branches/stable-1.0/CHANGELOG =================================================================== --- branches/stable-1.0/CHANGELOG 2008-03-12 20:44:01 UTC (rev 935) +++ branches/stable-1.0/CHANGELOG 2008-03-12 21:21:40 UTC (rev 936) @@ -4,6 +4,7 @@ -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc --- +03122008 - Removed a FIXME. 03112008 - Fixed wrong array index in Windows platform layer (thanks, James!). 03082008 - Fixed compiler warnings in Windows platform layer (thanks, Dennis!). 02202008 - Various archiver swap and compare functions now check if they are Modified: branches/stable-1.0/platform/win32.c =================================================================== --- branches/stable-1.0/platform/win32.c 2008-03-12 20:44:01 UTC (rev 935) +++ branches/stable-1.0/platform/win32.c 2008-03-12 21:21:40 UTC (rev 936) @@ -204,7 +204,7 @@ lib = LoadLibrary("userenv.dll"); if (lib) { - /* !!! FIXME: Handle Unicode? */ + /* If you want Unicode, upgrade to PhysicsFS 1.1.1 or later! */ GetUserProfileDirectory = (LPFNGETUSERPROFILEDIR) GetProcAddress(lib, "GetUserProfileDirectoryA"); if (GetUserProfileDirectory) From DONOTREPLY at icculus.org Wed Mar 12 17:22:22 2008 From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org) Date: 12 Mar 2008 17:22:22 -0400 Subject: r937 - in trunk: . platform Message-ID: <20080312212222.5418.qmail@icculus.org> Author: icculus Date: 2008-03-12 17:22:22 -0400 (Wed, 12 Mar 2008) New Revision: 937 Modified: trunk/CHANGELOG.txt trunk/physfs_internal.h trunk/platform/windows.c Log: Fixed aliasing bug in Windows platform layer (thanks, Dennis!). Modified: trunk/CHANGELOG.txt =================================================================== --- trunk/CHANGELOG.txt 2008-03-12 21:21:40 UTC (rev 936) +++ trunk/CHANGELOG.txt 2008-03-12 21:22:22 UTC (rev 937) @@ -2,6 +2,7 @@ * CHANGELOG. */ +03122008 - Fixed aliasing bug in Windows platform layer (thanks, Dennis!). 03102008 - Changed some text files from ISO-8859-1 to UTF-8. Replaced all the translations with UTF-8 encoded equivalents. 03082008 - Fixed compiler warnings in Windows platform layer (thanks, Dennis!). Modified: trunk/physfs_internal.h =================================================================== --- trunk/physfs_internal.h 2008-03-12 21:21:40 UTC (rev 936) +++ trunk/physfs_internal.h 2008-03-12 21:22:22 UTC (rev 937) @@ -33,6 +33,13 @@ extern "C" { #endif +#ifdef __GNUC__ +#define PHYSFS_MINIMUM_GCC_VER(major, minor) \ + ( ((__GNUC__ << 16) + __GNUC_MINOR__) >= (((major) << 16) + (minor)) ) +#else +#define PHYSFS_MINIMUM_GCC_VER(major, minor) (0) +#endif + /* * Interface for small allocations. If you need a little scratch space for * a throwaway buffer or string, use this. It will make small allocations @@ -1020,6 +1027,7 @@ #define __PHYSFS_UI64(x) x #endif + /* * Check if a ui64 will fit in the platform's address space. * The initial sizeof check will optimize this macro out entirely on @@ -1032,6 +1040,7 @@ ((s) > (__PHYSFS_UI64(0xFFFFFFFFFFFFFFFF) >> (64-(sizeof(size_t)*8)))) \ ) + /* * This is a strcasecmp() or stricmp() replacement that expects both strings * to be in UTF-8 encoding. It will do "case folding" to decide if the Modified: trunk/platform/windows.c =================================================================== --- trunk/platform/windows.c 2008-03-12 21:21:40 UTC (rev 936) +++ trunk/platform/windows.c 2008-03-12 21:22:22 UTC (rev 937) @@ -256,10 +256,21 @@ } /* fallbackCreateFileW */ -/* A blatant abuse of pointer casting... */ -static int symLookup(HMODULE dll, void **addr, const char *sym) +#if (PHYSFS_MINIMUM_GCC_VERSION(3,3)) + typedef FARPROC __attribute__((__may_alias__)) PHYSFS_FARPROC; +#else + typedef FARPROC PHYSFS_FARPROC; +#endif + + +static void symLookup(HMODULE dll, PHYSFS_FARPROC *addr, const char *sym, + int reallyLook, PHYSFS_FARPROC fallback) { - return( (*addr = GetProcAddress(dll, sym)) != NULL ); + PHYSFS_FARPROC proc; + proc = (PHYSFS_FARPROC) ((reallyLook) ? GetProcAddress(dll, sym) : NULL); + if (proc == NULL) + proc = fallback; /* may also be NULL. */ + *addr = proc; } /* symLookup */ @@ -267,17 +278,12 @@ { HMODULE dll = NULL; - #define LOOKUP_NOFALLBACK(x, reallyLook) { \ - if (reallyLook) \ - symLookup(dll, (void **) &p##x, #x); \ - else \ - p##x = NULL; \ - } + #define LOOKUP_NOFALLBACK(x, reallyLook) \ + symLookup(dll, (PHYSFS_FARPROC *) &p##x, #x, reallyLook, NULL) - #define LOOKUP(x, reallyLook) { \ - if ((!reallyLook) || (!symLookup(dll, (void **) &p##x, #x))) \ - p##x = fallback##x; \ - } + #define LOOKUP(x, reallyLook) \ + symLookup(dll, (PHYSFS_FARPROC *) &p##x, #x, \ + reallyLook, (PHYSFS_FARPROC) fallback##x) /* Apparently Win9x HAS the Unicode entry points, they just don't WORK. */ /* ...so don't look them up unless we're on NT+. (see osHasUnicode.) */ From DONOTREPLY at icculus.org Wed Mar 12 17:35:55 2008 From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org) Date: 12 Mar 2008 17:35:55 -0400 Subject: r938 - trunk/platform Message-ID: <20080312213555.2377.qmail@icculus.org> Author: icculus Date: 2008-03-12 17:35:54 -0400 (Wed, 12 Mar 2008) New Revision: 938 Modified: trunk/platform/windows.c Log: Patched to compile. Modified: trunk/platform/windows.c =================================================================== --- trunk/platform/windows.c 2008-03-12 21:22:22 UTC (rev 937) +++ trunk/platform/windows.c 2008-03-12 21:35:54 UTC (rev 938) @@ -256,7 +256,7 @@ } /* fallbackCreateFileW */ -#if (PHYSFS_MINIMUM_GCC_VERSION(3,3)) +#if PHYSFS_MINIMUM_GCC_VERSION(3,3) typedef FARPROC __attribute__((__may_alias__)) PHYSFS_FARPROC; #else typedef FARPROC PHYSFS_FARPROC; From DONOTREPLY at icculus.org Wed Mar 12 17:42:16 2008 From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org) Date: 12 Mar 2008 17:42:16 -0400 Subject: r939 - in trunk: . platform Message-ID: <20080312214216.15932.qmail@icculus.org> Author: icculus Date: 2008-03-12 17:42:16 -0400 (Wed, 12 Mar 2008) New Revision: 939 Modified: trunk/physfs_internal.h trunk/platform/windows.c Log: Yet another attempt to patch to compile. Modified: trunk/physfs_internal.h =================================================================== --- trunk/physfs_internal.h 2008-03-12 21:35:54 UTC (rev 938) +++ trunk/physfs_internal.h 2008-03-12 21:42:16 UTC (rev 939) @@ -34,10 +34,10 @@ #endif #ifdef __GNUC__ -#define PHYSFS_MINIMUM_GCC_VER(major, minor) \ +#define PHYSFS_MINIMUM_GCC_VERSION(major, minor) \ ( ((__GNUC__ << 16) + __GNUC_MINOR__) >= (((major) << 16) + (minor)) ) #else -#define PHYSFS_MINIMUM_GCC_VER(major, minor) (0) +#define PHYSFS_MINIMUM_GCC_VERSION(major, minor) (0) #endif /* Modified: trunk/platform/windows.c =================================================================== --- trunk/platform/windows.c 2008-03-12 21:35:54 UTC (rev 938) +++ trunk/platform/windows.c 2008-03-12 21:42:16 UTC (rev 939) @@ -256,7 +256,7 @@ } /* fallbackCreateFileW */ -#if PHYSFS_MINIMUM_GCC_VERSION(3,3) +#if (PHYSFS_MINIMUM_GCC_VERSION(3,3)) typedef FARPROC __attribute__((__may_alias__)) PHYSFS_FARPROC; #else typedef FARPROC PHYSFS_FARPROC;