touched up code for warp 4
This commit is contained in:
@ -36,11 +36,12 @@ typedef qse_cmgr_t* (*qse_cmgr_finder_t) (const qse_char_t* name);
|
||||
enum qse_cmgr_id_t
|
||||
{
|
||||
QSE_CMGR_SLMB,
|
||||
#if defined(QSE_INCLUDE_MORE_CMGRS)
|
||||
QSE_CMGR_CP949,
|
||||
QSE_CMGR_CP950,
|
||||
#endif
|
||||
QSE_CMGR_UTF8
|
||||
#if defined(QSE_ENABLE_XCMGRS)
|
||||
,
|
||||
QSE_CMGR_CP949,
|
||||
QSE_CMGR_CP950
|
||||
#endif
|
||||
};
|
||||
typedef enum qse_cmgr_id_t qse_cmgr_id_t;
|
||||
|
||||
|
@ -62,7 +62,12 @@
|
||||
# if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR)
|
||||
# define QSE_CHAR_IS_WCHAR 1
|
||||
# endif
|
||||
# undef QSE_ENABLE_BUNDLED_UNICODE
|
||||
|
||||
/* old watcom c/c++ compiler requires this */
|
||||
# if (__WATCOMC__ < 1200)
|
||||
# undef QSE_ENABLE_BUNDLED_UNICODE
|
||||
# define QSE_ENABLE_BUNDLED_UNICODE 1
|
||||
# endif
|
||||
|
||||
#elif defined(__WATCOMC__) && !defined(__386__)
|
||||
# define QSE_SIZEOF_CHAR 1
|
||||
@ -96,10 +101,15 @@
|
||||
# if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR)
|
||||
# define QSE_CHAR_IS_WCHAR 1
|
||||
# endif
|
||||
# undef QSE_ENABLE_BUNDLED_UNICODE
|
||||
|
||||
/* old watcom c/c++ compiler requires this */
|
||||
# if (__WATCOMC__ < 1200)
|
||||
# undef QSE_ENABLE_BUNDLED_UNICODE
|
||||
# define QSE_ENABLE_BUNDLED_UNICODE 1
|
||||
# endif
|
||||
|
||||
#else
|
||||
# error Define the size of various data types.
|
||||
#endif
|
||||
|
||||
#include "conf-inf.h"
|
||||
#include <qse/conf-inf.h>
|
||||
|
@ -49,7 +49,11 @@ _M_X64 x64 platform
|
||||
# define QSE_SIZEOF_SHORT 2
|
||||
# define QSE_SIZEOF_INT 4
|
||||
# define QSE_SIZEOF_LONG 4
|
||||
# define QSE_SIZEOF_LONG_LONG 8
|
||||
# if (__WATCOMC__ < 1200)
|
||||
# define QSE_SIZEOF_LONG_LONG 0
|
||||
# else
|
||||
# define QSE_SIZEOF_LONG_LONG 8
|
||||
# endif
|
||||
|
||||
# if defined(_WIN64)
|
||||
# define QSE_SIZEOF_VOID_P 8
|
||||
@ -80,7 +84,12 @@ _M_X64 x64 platform
|
||||
# if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR)
|
||||
# define QSE_CHAR_IS_WCHAR 1
|
||||
# endif
|
||||
# undef QSE_ENABLE_BUNDLED_UNICODE
|
||||
|
||||
/* old watcom c/c++ compiler requires this */
|
||||
# if (__WATCOMC__ < 1200)
|
||||
# undef QSE_ENABLE_BUNDLED_UNICODE
|
||||
# define QSE_ENABLE_BUNDLED_UNICODE 1
|
||||
# endif
|
||||
|
||||
#elif defined(__GNUC__) || defined(__DMC__) || defined(__POCC__)
|
||||
# define QSE_SIZEOF_CHAR 1
|
||||
@ -118,7 +127,6 @@ _M_X64 x64 platform
|
||||
# if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR)
|
||||
# define QSE_CHAR_IS_WCHAR 1
|
||||
# endif
|
||||
# undef QSE_ENABLE_BUNDLED_UNICODE
|
||||
|
||||
#elif defined(_MSC_VER)
|
||||
# define QSE_SIZEOF_CHAR 1
|
||||
@ -160,7 +168,6 @@ _M_X64 x64 platform
|
||||
# if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR)
|
||||
# define QSE_CHAR_IS_WCHAR 1
|
||||
# endif
|
||||
# undef QSE_ENABLE_BUNDLED_UNICODE
|
||||
|
||||
#elif defined(__BORLANDC__)
|
||||
|
||||
@ -199,10 +206,9 @@ _M_X64 x64 platform
|
||||
# if !defined(QSE_CHAR_IS_WCHAR) && !defined(QSE_CHAR_IS_MCHAR)
|
||||
# define QSE_CHAR_IS_WCHAR 1
|
||||
# endif
|
||||
# undef QSE_ENABLE_BUNDLED_UNICODE
|
||||
|
||||
#else
|
||||
# error Define the size of various data types.
|
||||
#endif
|
||||
|
||||
#include "conf-inf.h"
|
||||
#include <qse/conf-inf.h>
|
||||
|
@ -35,7 +35,11 @@
|
||||
# define QSE_SIZEOF_SHORT 2
|
||||
# define QSE_SIZEOF_INT 4
|
||||
# define QSE_SIZEOF_LONG 4
|
||||
# define QSE_SIZEOF_LONG_LONG 8
|
||||
# if (__WATCOMC__ < 1200)
|
||||
# define QSE_SIZEOF_LONG_LONG 0
|
||||
# else
|
||||
# define QSE_SIZEOF_LONG_LONG 8
|
||||
# endif
|
||||
# define QSE_SIZEOF_VOID_P 4
|
||||
# define QSE_SIZEOF_FLOAT 4
|
||||
# define QSE_SIZEOF_DOUBLE 8
|
||||
@ -65,7 +69,11 @@
|
||||
# define QSE_CHAR_IS_WCHAR 1
|
||||
# endif
|
||||
|
||||
# undef QSE_ENABLE_BUNDLED_UNICODE
|
||||
/* old watcom c/c++ compiler requires this */
|
||||
# if (__WATCOMC__ < 1200)
|
||||
# undef QSE_ENABLE_BUNDLED_UNICODE
|
||||
# define QSE_ENABLE_BUNDLED_UNICODE 1
|
||||
# endif
|
||||
|
||||
#elif defined(__BORLANDC__)
|
||||
# define QSE_SIZEOF_CHAR 1
|
||||
|
@ -116,4 +116,4 @@
|
||||
#define QSE_MBLEN_MAX 8
|
||||
|
||||
|
||||
#include "conf-inf.h"
|
||||
#include <qse/conf-inf.h>
|
||||
|
@ -622,6 +622,9 @@
|
||||
/* enable qse_sed_setexectracer() */
|
||||
#undef QSE_ENABLE_SEDTRACER
|
||||
|
||||
/* include more built-in cmgrs like cp949 and cp950 */
|
||||
#undef QSE_ENABLE_XCMGRS
|
||||
|
||||
/* Big Endian */
|
||||
#undef QSE_ENDIAN_BIG
|
||||
|
||||
@ -631,9 +634,6 @@
|
||||
/* Unknown Endian */
|
||||
#undef QSE_ENDIAN_UNKNOWN
|
||||
|
||||
/* include more built-in cmgrs like cp949 and cp950 */
|
||||
#undef QSE_INCLUDE_MORE_CMGRS
|
||||
|
||||
/* MB_LEN_MAX */
|
||||
#undef QSE_MBLEN_MAX
|
||||
|
||||
|
Reference in New Issue
Block a user