diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-03-13 18:37:21 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-03-14 10:54:06 +0100 |
| commit | 46669f3517493d0a758903861ca8343c90d2ffe9 (patch) | |
| tree | 74b960f9741cc0feabf90fee1386a468ade74c19 /src/core5/codecs/qjpunicode.cpp | |
| parent | f6280ee76c09793b69db97369dc3ef3882069273 (diff) | |
Resolve some duplicate macro definition errors
To resolved an issue caused by duplicate macro definition, I moved
all the codec helper macros into a header file, and removed the
duplicate ones.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I9afdd48fc3a7c29c3ec8996df90cf488b9701c67
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/core5/codecs/qjpunicode.cpp')
| -rw-r--r-- | src/core5/codecs/qjpunicode.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/core5/codecs/qjpunicode.cpp b/src/core5/codecs/qjpunicode.cpp index cd03ee7..371e002 100644 --- a/src/core5/codecs/qjpunicode.cpp +++ b/src/core5/codecs/qjpunicode.cpp @@ -18,16 +18,6 @@ QT_BEGIN_NAMESPACE #define Q_STRICT -#define IsLatin(c) (/*((c) >= 0x00) &&*/ ((c) <= 0x7f)) -#define IsKana(c) (((c) >= 0xa1) && ((c) <= 0xdf)) -#define IsJisChar(c) (((c) >= 0x21) && ((c) <= 0x7e)) -#define IsSjisChar1(c) ((((c) >= 0x81) && ((c) <= 0x9f)) || \ - (((c) >= 0xe0) && ((c) <= 0xfc))) -#define IsSjisUDC1(c) (((c) >= 0xf0) && ((c) <= 0xfc)) -#define IsSjisChar2(c) (((c) >= 0x40) && ((c) != 0x7f) && ((c) <= 0xfc)) - -#define IsSjisIBMVDCChar1(c) (((c) >= 0xfa) && ((c) <= 0xfc)) - static uint jisx0208ToSjis(uint h, uint l); static inline uint jisx0208ToSjis(uint jis) |