Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Elimiante include of defs.h for VisualAge compiles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-10-22 22:13:51 +00:00
parent 42f2e3e9bb
commit 9e279f1462
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/extended.c
View File

@@ -1,4 +1,7 @@
#ifndef __VISAGECPP__ /* DW: why does anyone need this for this module? */
#include "wx/defs.h" #include "wx/defs.h"
#endif
#include "wx/setup.h" #include "wx/setup.h"
#include <math.h> #include <math.h>

50
src/common/unzip.c
View File

@@ -12,8 +12,10 @@ $Id$
*/ */
#ifndef __VISAGECPP__
#include "wx/defs.h" #include "wx/defs.h"
#endif
#include "wx/setup.h" #include "wx/setup.h"
#if wxUSE_ZLIB && wxUSE_ZIPSTREAM #if wxUSE_ZLIB && wxUSE_ZIPSTREAM
@@ -322,13 +324,13 @@ local uLong unzlocal_SearchCentralDir(fin)
uLong uBackRead; uLong uBackRead;
uLong uMaxBack=0xffff; /* maximum size of global comment */ uLong uMaxBack=0xffff; /* maximum size of global comment */
uLong uPosFound=0; uLong uPosFound=0;
if (fseek(fin,0,SEEK_END) != 0) if (fseek(fin,0,SEEK_END) != 0)
return 0; return 0;
uSizeFile = ftell( fin ); uSizeFile = ftell( fin );
if (uMaxBack>uSizeFile) if (uMaxBack>uSizeFile)
uMaxBack = uSizeFile; uMaxBack = uSizeFile;
@@ -346,7 +348,7 @@ local uLong unzlocal_SearchCentralDir(fin)
else else
uBackRead+=BUFREADCOMMENT; uBackRead+=BUFREADCOMMENT;
uReadPos = uSizeFile-uBackRead ; uReadPos = uSizeFile-uBackRead ;
uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
(BUFREADCOMMENT+4) : (uSizeFile-uReadPos); (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
if (fseek(fin,uReadPos,SEEK_SET)!=0) if (fseek(fin,uReadPos,SEEK_SET)!=0)
@@ -511,12 +513,12 @@ extern unzFile ZEXPORT unzOpen (path)
(us.offset_central_dir+us.size_central_dir); (us.offset_central_dir+us.size_central_dir);
us.central_pos = central_pos; us.central_pos = central_pos;
us.pfile_in_zip_read = NULL; us.pfile_in_zip_read = NULL;
s=(unz_s*)ALLOC(sizeof(unz_s)); s=(unz_s*)ALLOC(sizeof(unz_s));
*s=us; *s=us;
unzGoToFirstFile((unzFile)s); unzGoToFirstFile((unzFile)s);
return (unzFile)s; return (unzFile)s;
} }
@@ -695,7 +697,7 @@ local int unzlocal_GetCurrentFileInfoInternal (file,
lSeek -= uSizeRead; lSeek -= uSizeRead;
} }
if ((err==UNZ_OK) && (extraField!=NULL)) if ((err==UNZ_OK) && (extraField!=NULL))
{ {
uLong uSizeRead ; uLong uSizeRead ;
@@ -720,7 +722,7 @@ local int unzlocal_GetCurrentFileInfoInternal (file,
else else
lSeek+=file_info.size_file_extra; lSeek+=file_info.size_file_extra;
if ((err==UNZ_OK) && (szComment!=NULL)) if ((err==UNZ_OK) && (szComment!=NULL))
{ {
uLong uSizeRead ; uLong uSizeRead ;
@@ -814,7 +816,7 @@ extern int ZEXPORT unzGoToFirstFile (file)
extern int ZEXPORT unzGoToNextFile (file) extern int ZEXPORT unzGoToNextFile (file)
unzFile file; unzFile file;
{ {
unz_s* s; unz_s* s;
int err; int err;
if (file==NULL) if (file==NULL)
@@ -849,7 +851,7 @@ extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
const char *szFileName; const char *szFileName;
int iCaseSensitivity; int iCaseSensitivity;
{ {
unz_s* s; unz_s* s;
int err; int err;
const char *c; const char *c;
char *c2; char *c2;
@@ -862,7 +864,7 @@ extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
if (*c == '\\') *c2 = '/'; if (*c == '\\') *c2 = '/';
else *c2 = *c; else *c2 = *c;
*c2 = '\0'; *c2 = '\0';
if (file==NULL) if (file==NULL)
return UNZ_PARAMERROR; return UNZ_PARAMERROR;
@@ -991,7 +993,7 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
return err; return err;
} }
/* /*
Open for reading data the current file in the zipfile. Open for reading data the current file in the zipfile.
If there is no error and the file is opened, the return value is UNZ_OK. If there is no error and the file is opened, the return value is UNZ_OK.
@@ -1037,7 +1039,7 @@ extern int ZEXPORT unzOpenCurrentFile (file)
} }
pfile_in_zip_read_info->stream_initialised=0; pfile_in_zip_read_info->stream_initialised=0;
if ((s->cur_file_info.compression_method!=0) && if ((s->cur_file_info.compression_method!=0) &&
(s->cur_file_info.compression_method!=Z_DEFLATED)) (s->cur_file_info.compression_method!=Z_DEFLATED))
err=UNZ_BADZIPFILE; err=UNZ_BADZIPFILE;
@@ -1074,11 +1076,11 @@ extern int ZEXPORT unzOpenCurrentFile (file)
pfile_in_zip_read_info->rest_read_uncompressed = pfile_in_zip_read_info->rest_read_uncompressed =
s->cur_file_info.uncompressed_size ; s->cur_file_info.uncompressed_size ;
pfile_in_zip_read_info->pos_in_zipfile = pfile_in_zip_read_info->pos_in_zipfile =
s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
iSizeVar; iSizeVar;
pfile_in_zip_read_info->stream.avail_in = (uInt)0; pfile_in_zip_read_info->stream.avail_in = (uInt)0;
@@ -1123,7 +1125,7 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len)
pfile_in_zip_read_info->stream.next_out = (Bytef*)buf; pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
pfile_in_zip_read_info->stream.avail_out = (uInt)len; pfile_in_zip_read_info->stream.avail_out = (uInt)len;
if (len>pfile_in_zip_read_info->rest_read_uncompressed) if (len>pfile_in_zip_read_info->rest_read_uncompressed)
pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->stream.avail_out =
(uInt)pfile_in_zip_read_info->rest_read_uncompressed; (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
@@ -1148,7 +1150,7 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len)
pfile_in_zip_read_info->pos_in_zipfile += uReadThis; pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
pfile_in_zip_read_info->rest_read_compressed-=uReadThis; pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
pfile_in_zip_read_info->stream.next_in = pfile_in_zip_read_info->stream.next_in =
(Bytef*)pfile_in_zip_read_info->read_buffer; (Bytef*)pfile_in_zip_read_info->read_buffer;
pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis; pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
@@ -1162,11 +1164,11 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len)
uDoCopy = pfile_in_zip_read_info->stream.avail_out ; uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
else else
uDoCopy = pfile_in_zip_read_info->stream.avail_in ; uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
for (i=0;i<uDoCopy;i++) for (i=0;i<uDoCopy;i++)
*(pfile_in_zip_read_info->stream.next_out+i) = *(pfile_in_zip_read_info->stream.next_out+i) =
*(pfile_in_zip_read_info->stream.next_in+i); *(pfile_in_zip_read_info->stream.next_in+i);
pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32, pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
pfile_in_zip_read_info->stream.next_out, pfile_in_zip_read_info->stream.next_out,
uDoCopy); uDoCopy);
@@ -1198,7 +1200,7 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len)
uTotalOutAfter = pfile_in_zip_read_info->stream.total_out; uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
uOutThis = uTotalOutAfter-uTotalOutBefore; uOutThis = uTotalOutAfter-uTotalOutBefore;
pfile_in_zip_read_info->crc32 = pfile_in_zip_read_info->crc32 =
crc32(pfile_in_zip_read_info->crc32,bufBefore, crc32(pfile_in_zip_read_info->crc32,bufBefore,
(uInt)(uOutThis)); (uInt)(uOutThis));
@@ -1256,7 +1258,7 @@ extern int ZEXPORT unzeof (file)
if (pfile_in_zip_read_info==NULL) if (pfile_in_zip_read_info==NULL)
return UNZ_PARAMERROR; return UNZ_PARAMERROR;
if (pfile_in_zip_read_info->rest_read_uncompressed == 0) if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
return 1; return 1;
else else
@@ -1300,7 +1302,7 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
if (buf==NULL) if (buf==NULL)
return (int)size_to_read; return (int)size_to_read;
if (len>size_to_read) if (len>size_to_read)
read_now = (uInt)size_to_read; read_now = (uInt)size_to_read;
else else
@@ -1308,7 +1310,7 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
if (read_now==0) if (read_now==0)
return 0; return 0;
if (fseek(pfile_in_zip_read_info->file, if (fseek(pfile_in_zip_read_info->file,
pfile_in_zip_read_info->offset_local_extrafield + pfile_in_zip_read_info->offset_local_extrafield +
pfile_in_zip_read_info->pos_local_extrafield,SEEK_SET)!=0) pfile_in_zip_read_info->pos_local_extrafield,SEEK_SET)!=0)