hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed to prefer char16_t with c11 compiler. yet to add --prefer-char16 option to configure.ac

Browse Source
This commit is contained in:
hyung-hwan
2018-01-29 15:38:32 +00:00
parent 11d1344b70
commit 2fbfe3a71b
7 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qse/cmd/awk/awk.c
View File

@ -161,7 +161,7 @@ static void stop_run (void* arg)
static void set_intr_run (void) static void set_intr_run (void)
{ {
qse_setintrhandler (stop_run, QSE_NULL); qse_set_intr_handler (stop_run, QSE_NULL);
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE) #if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE)
setsignal (SIGPIPE, SIG_IGN, 0); setsignal (SIGPIPE, SIG_IGN, 0);
#endif #endif
@ -169,7 +169,7 @@ static void set_intr_run (void)
static void unset_intr_run (void) static void unset_intr_run (void)
{ {
qse_clearintrhandler (); qse_clear_intr_handler ();
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE) #if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE)
setsignal (SIGPIPE, SIG_DFL, 0); setsignal (SIGPIPE, SIG_DFL, 0);
#endif #endif

4
qse/cmd/sed/sed.c
View File

@ -502,7 +502,7 @@ static void stop_run (void* arg)
static void set_intr_run (void) static void set_intr_run (void)
{ {
qse_setintrhandler (stop_run, QSE_NULL); qse_set_intr_handler (stop_run, QSE_NULL);
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE) #if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE)
setsignal (SIGPIPE, SIG_IGN, 0); setsignal (SIGPIPE, SIG_IGN, 0);
#endif #endif
@ -510,7 +510,7 @@ static void set_intr_run (void)
static void unset_intr_run (void) static void unset_intr_run (void)
{ {
qse_clearintrhandler (); qse_clear_intr_handler ();
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE) #if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE)
setsignal (SIGPIPE, SIG_DFL, 0); setsignal (SIGPIPE, SIG_DFL, 0);
#endif #endif

11
qse/include/qse/macros.h
View File

@ -273,8 +273,13 @@
*/ */
#define QSE_MT(txt) (txt) #define QSE_MT(txt) (txt)
#define QSE_WQ_I(val) (L ## #val) #if defined(QSE_WCHAR_IS_CHAR16_T)
#define QSE_WQ(val) QSE_WQ_I(val) # define QSE_WQ_I(val) (u ## #val)
# define QSE_WQ(val) QSE_WQ_I(val)
#else
# define QSE_WQ_I(val) (L ## #val)
# define QSE_WQ(val) QSE_WQ_I(val)
#endif
/** /**
* The #QSE_WT macro maps a multi-byte literal string to a wide character * The #QSE_WT macro maps a multi-byte literal string to a wide character
@ -282,6 +287,8 @@
*/ */
#if (QSE_SIZEOF_WCHAR_T == QSE_SIZEOF_MCHAR_T) #if (QSE_SIZEOF_WCHAR_T == QSE_SIZEOF_MCHAR_T)
# define QSE_WT(txt) (txt) # define QSE_WT(txt) (txt)
#elif defined(QSE_WCHAR_IS_CHAR16_T)
# define QSE_WT(txt) (u ## txt)
#else #else
# define QSE_WT(txt) (L ## txt) # define QSE_WT(txt) (L ## txt)
#endif #endif

4
qse/include/qse/si/intr.h
View File

@ -42,8 +42,8 @@ typedef void (*qse_intr_handler_t) (void *arg);
extern "C" { extern "C" {
#endif #endif
QSE_EXPORT void qse_setintrhandler (qse_intr_handler_t handler, void* arg); QSE_EXPORT void qse_set_intr_handler (qse_intr_handler_t handler, void* arg);
QSE_EXPORT void qse_clearintrhandler (void); QSE_EXPORT void qse_clear_intr_handler (void);
#ifdef __cplusplus #ifdef __cplusplus
} }

23
qse/include/qse/types.h
View File

@ -523,7 +523,7 @@ typedef unsigned char qse_mchau_t;
* #QSE_MCHAR_EOF. * #QSE_MCHAR_EOF.
*/ */
typedef int qse_mcint_t; typedef int qse_mcint_t;
#define QSE_SIZEOF_MCINT_T QSE_SIZEOF_INT /*#define QSE_SIZEOF_MCINT_T QSE_SIZEOF_INT*/
/** \typedef qse_wchar_t /** \typedef qse_wchar_t
@ -536,7 +536,26 @@ typedef int qse_mcint_t;
* The qse_wcint_t type defines a type that can hold a qse_wchar_t value and * The qse_wcint_t type defines a type that can hold a qse_wchar_t value and
* #QSE_WCHAR_EOF. * #QSE_WCHAR_EOF.
*/ */
#if defined(__cplusplus) && (defined(__WATCOMC__) && (__WATCOMC__ < 1200))
#if /*defined(QSE_PREFER_CHAR16_T) &&*/ defined(__GNUC__) && defined(__CHAR16_TYPE__) && \
defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
/* C11 */
typedef __CHAR16_TYPE__ qse_wchar_t;
typedef qse_uint16_t qse_wchau_t;
#if (QSE_SIZEOF_INT > 2)
typedef int qse_wcint_t;
#else
typedef qse_uint16_t qse_wcint_t;
#endif
#define QSE_WCHAR_IS_CHAR16_T
#undef QSE_SIZEOF_WCHAR_T
#define QSE_SIZEOF_WCHAR_T 2
#elif defined(__cplusplus) && (defined(__WATCOMC__) && (__WATCOMC__ < 1200))
/* WATCOM C++ before OpenWatcom */ /* WATCOM C++ before OpenWatcom */
typedef long char qse_wchar_t; typedef long char qse_wchar_t;

4
qse/lib/si/intr.c
View File

@ -127,7 +127,7 @@ static int setsignal (int sig, void(*handler)(int), int restart)
} }
#endif #endif
void qse_setintrhandler (qse_intr_handler_t handler, void* arg) void qse_set_intr_handler (qse_intr_handler_t handler, void* arg)
{ {
intr_handler = handler; intr_handler = handler;
intr_handler_arg = arg; intr_handler_arg = arg;
@ -145,7 +145,7 @@ void qse_setintrhandler (qse_intr_handler_t handler, void* arg)
#endif #endif
} }
void qse_clearintrhandler (void) void qse_clear_intr_handler (void)
{ {
intr_handler = QSE_NULL; intr_handler = QSE_NULL;
intr_handler_arg = QSE_NULL; intr_handler_arg = QSE_NULL;

4
qse/samples/si/rwl01.c
View File

@ -125,9 +125,9 @@ int main ()
qse_open_stdsios (); qse_open_stdsios ();
qse_setintrhandler (stop_run, QSE_NULL); qse_set_intr_handler (stop_run, QSE_NULL);
test_001 (); test_001 ();
qse_clearintrhandler (); qse_clear_intr_handler ();
qse_close_stdsios (); qse_close_stdsios ();