somebody added #ifdefed #pragma to disable warnings about // in c source, instead of fixing the comments, grrr. So I fixed it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
27f5b0c3dc
commit
076bae67da
@ -1,15 +1,17 @@
|
||||
/*
|
||||
|
||||
This file was altered for needs of wxWindows.
|
||||
$Id$
|
||||
|
||||
*/
|
||||
|
||||
/* unzip.c -- IO on .zip files using zlib
|
||||
Version 0.15 beta, Mar 19th, 1998,
|
||||
|
||||
Read unzip.h for more info
|
||||
|
||||
*/
|
||||
|
||||
#if 0
|
||||
for what compiler ?
|
||||
#if !defined(__VISAGECPP__)
|
||||
# pragma warning(disable:4001) /* non standard extension used: single line comment */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#include "wx/setup.h"
|
||||
@ -360,23 +362,23 @@ wxUnix2MacFilename (char *s)
|
||||
{
|
||||
if ( *s == '.' )
|
||||
{
|
||||
// relative path , since it goes on with slash which is translated to a :
|
||||
/* relative path , since it goes on with slash which is translated to a : */
|
||||
memmove( s , s+1 ,strlen( s ) ) ;
|
||||
}
|
||||
else if ( *s == '/' )
|
||||
{
|
||||
// absolute path -> on mac just start with the drive name
|
||||
/* absolute path -> on mac just start with the drive name */
|
||||
memmove( s , s+1 ,strlen( s ) ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
// wxASSERT_MSG( 1 , "unkown path beginning" ) ;
|
||||
/* wxASSERT_MSG( 1 , "unkown path beginning" ) ; */
|
||||
}
|
||||
while (*s)
|
||||
{
|
||||
if (*s == '/' || *s == '\\')
|
||||
{
|
||||
// convert any back-directory situations
|
||||
/* convert any back-directory situations */
|
||||
if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) )
|
||||
{
|
||||
*s = ':';
|
||||
|
@ -1,3 +1,10 @@
|
||||
/*
|
||||
|
||||
This file was altered for needs of wxWindows.
|
||||
$Id$
|
||||
|
||||
*/
|
||||
|
||||
/* unzip.h -- IO for uncompress .zip files using zlib
|
||||
Version 0.15 beta, Mar 19th, 1998,
|
||||
|
||||
@ -269,7 +276,7 @@ extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
|
||||
*/
|
||||
|
||||
#if defined(__VISAGECPP__)
|
||||
//Visualage complains of no prototypes
|
||||
/*Visualage complains of no prototypes*/
|
||||
int unzlocal_getByte(FILE* , int*);
|
||||
int strcmpcasenosensitive_internal (const char*, const char*);
|
||||
int unzlocal_getShort (FILE*, uLong*);
|
||||
|
Loading…
Reference in New Issue
Block a user