diff options
Diffstat (limited to 'audio/zinf/files/patch-ui-zinf-src-ThemeZip.cpp')
| -rw-r--r-- | audio/zinf/files/patch-ui-zinf-src-ThemeZip.cpp | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/audio/zinf/files/patch-ui-zinf-src-ThemeZip.cpp b/audio/zinf/files/patch-ui-zinf-src-ThemeZip.cpp index 329ae901ce37..3c2c7f711ebd 100644 --- a/audio/zinf/files/patch-ui-zinf-src-ThemeZip.cpp +++ b/audio/zinf/files/patch-ui-zinf-src-ThemeZip.cpp @@ -1,40 +1,16 @@ ---- ui/zinf/src/ThemeZip.cpp.orig Sun Feb 23 09:35:06 2003 -+++ ui/zinf/src/ThemeZip.cpp Thu Aug 21 21:56:19 2003 -@@ -24,6 +24,10 @@ +--- ui/zinf/src/ThemeZip.cpp.orig Wed Sep 17 02:36:22 2003 ++++ ui/zinf/src/ThemeZip.cpp Mon Feb 16 13:39:03 2004 +@@ -21,11 +21,12 @@ + $Id: ThemeZip.cpp,v 1.8 2003/09/16 17:36:22 kgk Exp $ + ____________________________________________________________________________*/ + +-#include <stdint.h> #include <time.h> #include <stdio.h> #include <ctype.h> -+#include <inttypes.h> +#if HAVE_STDINT_H -+#include <stdint.h> + #include <stdint.h> +#endif #ifdef WIN32 #include <windows.h> -@@ -145,7 +149,7 @@ - oFile = *(*i); - pPtr = strrchr(oFile.c_str(), DIR_MARKER); - if (pPtr) -- oFile.erase(0, ((int)pPtr - (int)oFile.c_str()) + 1); -+ oFile.erase(0, ((uintptr_t)pPtr - (uintptr_t)oFile.c_str()) + 1); - - pIn = fopen((*i)->c_str(), "rb"); - if (pIn == NULL) -@@ -424,7 +428,7 @@ - - oUnpackFile = string(TarRecord.header.name); - // in case we have sub-directory in tar, take only filename -- unsigned int uPos; -+ uintptr_t uPos; - uPos=oUnpackFile.rfind('/'); - if(uPos!=oUnpackFile.npos) oUnpackFile.erase(0,uPos+1); - -@@ -553,7 +557,7 @@ - // see if it is directory record we are looking for - if(TarRecord.header.typeflag == DIRTYPE) - { -- unsigned int uPos; -+ uintptr_t uPos; - oDescriptiveName = string (TarRecord.header.name); - - // erase trailing slash |