define UChar32/UChar16 for MiniGUI version < 4.0.0

qpfeditor/qpfeditor.c

@@ -25,6 +25,11 @@
 
 #include "qpf.h"
 
+#if (_MINIGUI_VERSION_CODE < _VERSION_CODE(4,0,0))
+#   define Uchar32 UChar32
+#   define Uchar16 UChar16
+#endif
+
 #define IDC_FILE_OPEN           110
 #define IDC_FILE_SAVE           120
 #define IDC_FILE_RENAME         130

upfeditor/Makefile.am

@@ -4,8 +4,4 @@ upfeditor_SOURCES=upfeditor.c readupf.c dumpupf.c upf.h glyph.c upftree.c my_deb
 upftest_SOURCES=test.c readupf.c dumpupf.c upf.h glyph.c upftree.c
 
 upfeditor_LDADD=@MINIGUI_LIBS@ -lmgutils
-<<<<<<< HEAD
 upftest_LDADD=@MINIGUI_LIBS@ -lmgutils
-=======
-upftest_LDADD=@MINIGUI_LIBS@
->>>>>>> 0a582a17416e7b09d214e562141c866fa0d7dd8e

upfeditor/upf.h

@@ -11,6 +11,11 @@
 #ifndef __UPF_H_
 #define __UPF_H_
 
+#if (_MINIGUI_VERSION_CODE < _VERSION_CODE(4,0,0))
+#   define Uchar32 UChar32
+#   define Uchar16 UChar16
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif  /* __cplusplus */