diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2003-03-30 19:53:04 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2003-03-30 19:53:04 (GMT) |
| commit | b69146af8dce22431fc50dc3fcea6c7fd5fb1063 (patch) | |
| tree | dcb3e2354df7b19ebd9458aca416a61d4922bc5c /qtools | |
| parent | fc0deb3d8c9dad128e1d5f5c90a5dfc0b9d60eea (diff) | |
| download | Doxygen-b69146af8dce22431fc50dc3fcea6c7fd5fb1063.zip Doxygen-b69146af8dce22431fc50dc3fcea6c7fd5fb1063.tar.gz Doxygen-b69146af8dce22431fc50dc3fcea6c7fd5fb1063.tar.bz2 | |
Release-1.3-rc3-20030330
Diffstat (limited to 'qtools')
| -rw-r--r-- | qtools/qglobal.h | 3 | ||||
| -rw-r--r-- | qtools/qtextcodec.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qtools/qglobal.h b/qtools/qglobal.h index 2ec484c..53b082e 100644 --- a/qtools/qglobal.h +++ b/qtools/qglobal.h @@ -593,4 +593,7 @@ Q_EXPORT void qObsolete( const char *obj, const char *oldfunc ); Q_EXPORT void qObsolete( const char *message ); #endif +// DvH: added to avoid warnings on recent gcc versions +#define Q_DELETE_VOID_UNDEFINED + #endif // QGLOBAL_H diff --git a/qtools/qtextcodec.cpp b/qtools/qtextcodec.cpp index cdecfce..fbbc1f9 100644 --- a/qtools/qtextcodec.cpp +++ b/qtools/qtextcodec.cpp @@ -925,6 +925,7 @@ struct QMultiByteUnicodeTable { QMultiByteUnicodeTable* multibyte; }; +#ifndef QT_NO_CODECS static int getByte(char* &cursor) { int byte = 0; @@ -939,7 +940,6 @@ static int getByte(char* &cursor) return byte&0xff; } -#ifndef QT_NO_CODECS class QTextCodecFromIOD; class QTextCodecFromIODDecoder : public QTextDecoder { |