diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2003-03-30 19:53:04 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2003-03-30 19:53:04 (GMT) |
| commit | 535ddc3bb7b6a6d4b50855a06838c11b84a9f3fd (patch) | |
| tree | dcb3e2354df7b19ebd9458aca416a61d4922bc5c /qtools | |
| parent | 5eeee0ed4c1692c9a367a1232b74e44f1c4a460a (diff) | |
| download | Doxygen-535ddc3bb7b6a6d4b50855a06838c11b84a9f3fd.zip Doxygen-535ddc3bb7b6a6d4b50855a06838c11b84a9f3fd.tar.gz Doxygen-535ddc3bb7b6a6d4b50855a06838c11b84a9f3fd.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 { |