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

Suppress "Assignement in logical expression" type warnings for compilers that compain about this sort of thing.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-04-30 14:13:41 +00:00
parent 51523f25d7
commit 3875544933
2 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/imagtiff.cpp
View File

@@ -43,7 +43,7 @@ extern "C"
IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
static tsize_t static tsize_t LINKAGEMODE
_tiffNullProc(thandle_t WXUNUSED(handle), _tiffNullProc(thandle_t WXUNUSED(handle),
tdata_t WXUNUSED(buf), tdata_t WXUNUSED(buf),
tsize_t WXUNUSED(size)) tsize_t WXUNUSED(size))
@@ -51,7 +51,7 @@ _tiffNullProc(thandle_t WXUNUSED(handle),
return (tsize_t) -1; return (tsize_t) -1;
} }
static tsize_t static tsize_t LINKAGEMODE
_tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size) _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
{ {
wxInputStream *stream = (wxInputStream*) handle; wxInputStream *stream = (wxInputStream*) handle;
@@ -59,7 +59,7 @@ _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
return stream->LastRead(); return stream->LastRead();
} }
static tsize_t static tsize_t LINKAGEMODE
_tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size) _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
{ {
wxOutputStream *stream = (wxOutputStream*) handle; wxOutputStream *stream = (wxOutputStream*) handle;
@@ -67,7 +67,7 @@ _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
return stream->LastWrite(); return stream->LastWrite();
} }
static toff_t static toff_t LINKAGEMODE
_tiffSeekIProc(thandle_t handle, toff_t off, int whence) _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
{ {
wxInputStream *stream = (wxInputStream*) handle; wxInputStream *stream = (wxInputStream*) handle;
@@ -83,7 +83,7 @@ _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
return (toff_t)stream->SeekI( (off_t)off, mode ); return (toff_t)stream->SeekI( (off_t)off, mode );
} }
static toff_t static toff_t LINKAGEMODE
_tiffSeekOProc(thandle_t handle, toff_t off, int whence) _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
{ {
wxOutputStream *stream = (wxOutputStream*) handle; wxOutputStream *stream = (wxOutputStream*) handle;
@@ -99,20 +99,20 @@ _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
return (toff_t)stream->SeekO( (off_t)off, mode ); return (toff_t)stream->SeekO( (off_t)off, mode );
} }
static int static int LINKAGEMODE
_tiffCloseProc(thandle_t WXUNUSED(handle)) _tiffCloseProc(thandle_t WXUNUSED(handle))
{ {
return 0; // ? return 0; // ?
} }
static toff_t static toff_t LINKAGEMODE
_tiffSizeProc(thandle_t handle) _tiffSizeProc(thandle_t handle)
{ {
wxStreamBase *stream = (wxStreamBase*) handle; wxStreamBase *stream = (wxStreamBase*) handle;
return (toff_t) stream->GetSize(); return (toff_t) stream->GetSize();
} }
static int static int LINKAGEMODE
_tiffMapProc(thandle_t WXUNUSED(handle), _tiffMapProc(thandle_t WXUNUSED(handle),
tdata_t* WXUNUSED(pbase), tdata_t* WXUNUSED(pbase),
toff_t* WXUNUSED(psize)) toff_t* WXUNUSED(psize))
@@ -120,7 +120,7 @@ _tiffMapProc(thandle_t WXUNUSED(handle),
return 0; return 0;
} }
static void static void LINKAGEMODE
_tiffUnmapProc(thandle_t WXUNUSED(handle), _tiffUnmapProc(thandle_t WXUNUSED(handle),
tdata_t WXUNUSED(base), tdata_t WXUNUSED(base),
toff_t WXUNUSED(size)) toff_t WXUNUSED(size))

4
src/common/xpmdecod.cpp
View File

@@ -522,7 +522,7 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
// lot of gray... // lot of gray...
// so first extract ' ' // so first extract ' '
while ((p = strchr(name, ' '))) while ((p = strchr(name, ' ')) != NULL)
{ {
while (*(p)) // till eof of string while (*(p)) // till eof of string
{ {
@@ -540,7 +540,7 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
// substitute Grey with Gray, else rgbtab.h would have more than 100 // substitute Grey with Gray, else rgbtab.h would have more than 100
// 'duplicate' entries // 'duplicate' entries
if ( (grey = strstr(name, "grey")) ) if ( (grey = strstr(name, "grey")) != NULL )
grey[2] = 'a'; grey[2] = 'a';
// check for special 'none' colour: // check for special 'none' colour: