switched many #ifdef's to #if defined()

This commit is contained in:
2014-11-14 02:44:20 +00:00
parent 3db3396955
commit 0b286a7e2a
68 changed files with 156 additions and 156 deletions

View File

@ -21,13 +21,13 @@
#ifndef _QSE_LIB_AWK_ERR_H_
#define _QSE_LIB_AWK_ERR_H_
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
const qse_char_t* qse_awk_dflerrstr (const qse_awk_t* awk, qse_awk_errnum_t errnum);
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

View File

@ -38,7 +38,7 @@ struct qse_awk_fnc_t
qse_awk_mod_t* mod; /* set by the engine to a valid pointer if it's associated to a module */
};
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
@ -57,7 +57,7 @@ QSE_EXPORT int qse_awk_fnc_tolower (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t
QSE_EXPORT int qse_awk_fnc_toupper (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi);
QSE_EXPORT int qse_awk_fnc_sprintf (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi);
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

View File

@ -21,7 +21,7 @@
#ifndef _QSE_LIB_AWK_MISC_H_
#define _QSE_LIB_AWK_MISC_H_
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
@ -86,7 +86,7 @@ int qse_awk_rtx_matchrex (
qse_cstr_t* match
);
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

View File

@ -53,7 +53,7 @@ enum qse_awk_kwid_t
typedef enum qse_awk_kwid_t qse_awk_kwid_t;
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
@ -88,7 +88,7 @@ void qse_awk_clearsionames (
qse_awk_t* awk
);
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

View File

@ -21,7 +21,7 @@
#ifndef _QSE_LIB_AWK_RIO_H_
#define _QSE_LIB_AWK_RIO_H_
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
@ -54,7 +54,7 @@ int qse_awk_rtx_closeio (
void qse_awk_rtx_cleario (qse_awk_rtx_t* run);
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

View File

@ -102,7 +102,7 @@ enum qse_awk_incop_type_t
QSE_AWK_INCOP_MINUS
};
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
@ -117,7 +117,7 @@ qse_char_t* qse_awk_rtx_format (
qse_size_t* len
);
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

View File

@ -303,7 +303,7 @@ struct qse_awk_nde_print_t
qse_awk_nde_t* out;
};
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
@ -316,7 +316,7 @@ int qse_awk_prnptnpt (qse_awk_t* awk, qse_awk_nde_t* tree);
void qse_awk_clrpt (qse_awk_t* awk, qse_awk_nde_t* tree);
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

View File

@ -106,7 +106,7 @@ struct qse_awk_val_rchunk_t
#define QSE_AWK_RTX_GETVALTYPE(rtx,p) (IS_QUICKINT_POINTER(p)? QSE_AWK_VAL_INT: (p)->v_type)
#define QSE_AWK_RTX_GETINTFROMVAL(rtx,p) ((IS_QUICKINT_POINTER(p)? (qse_awk_int_t)GET_QUICKINT_FROM_POINTER(p): ((qse_awk_val_int_t*)(p))->i_val))
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
@ -137,7 +137,7 @@ void qse_awk_rtx_freevalchunk (
qse_awk_val_chunk_t* chunk
);
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

View File

@ -203,7 +203,7 @@ qse_mcint_t qse_tomctype (qse_mcint_t c, qse_mctype_t type)
int qse_iswctype (qse_wcint_t c, qse_wctype_t type)
{
/*
#ifdef HAVE_WCTYPE
#if defined(HAVE_WCTYPE)
static const char* name[] =
{
"upper",
@ -298,7 +298,7 @@ int qse_iswctype (qse_wcint_t c, qse_wctype_t type)
qse_wcint_t qse_towctype (qse_wcint_t c, qse_wctype_t type)
{
/*
#ifdef HAVE_WCTRANS
#if defined(HAVE_WCTRANS)
static const char* name[] =
{
"toupper",

View File

@ -98,7 +98,7 @@ struct qse_wfmtout_t
typedef struct qse_wfmtout_t qse_wfmtout_t;
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
@ -120,7 +120,7 @@ int qse_wfmtout (
# define qse_fmtout(fmt,fo,ap) qse_wfmtout(fmt,fo,ap)
#endif
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

View File

@ -37,7 +37,7 @@
typedef int qse_fs_syserr_t;
#endif
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
@ -46,6 +46,6 @@ qse_fs_errnum_t qse_fs_syserrtoerrnum (
qse_fs_syserr_t e
);
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

View File

@ -25,7 +25,7 @@
#define MINIMIZE_PLATFORM_DEPENDENCY
#ifdef MINIMIZE_PLATFORM_DEPENDENCY
#if defined(MINIMIZE_PLATFORM_DEPENDENCY)
# define QSE_MEMCPY(dst,src,len) qse_memcpy(dst,src,len)
# define QSE_MEMMOVE(dst,src,len) qse_memmove(dst,src,len)
# define QSE_MEMCMP(p1,p2,len) qse_memcmp(p1,p2,len)

View File

@ -961,7 +961,7 @@ create_process:
QSE_NULL, /* LPSECURITY_ATTRIBUTES lpProcessAttributes */
QSE_NULL, /* LPSECURITY_ATTRIBUTES lpThreadAttributes */
TRUE, /* BOOL bInheritHandles */
#ifdef QSE_CHAR_IS_MCHAR
#if defined(QSE_CHAR_IS_MCHAR)
0, /* DWORD dwCreationFlags */
#else
CREATE_UNICODE_ENVIRONMENT, /* DWORD dwCreationFlags */
@ -1216,7 +1216,7 @@ create_process:
{
qse_size_t n, mn;
#ifdef QSE_CHAR_IS_MCHAR
#if defined(QSE_CHAR_IS_MCHAR)
mn = qse_strlen(cmd);
#else
if (flags & QSE_PIO_MBSCMD)
@ -1242,7 +1242,7 @@ create_process:
qse_mbscpy (cmd_line, QSE_MT("cmd.exe")); /* cmd.exe\0/c */
qse_mbscpy (&cmd_line[8], QSE_MT("/c "));
#ifdef QSE_CHAR_IS_MCHAR
#if defined(QSE_CHAR_IS_MCHAR)
qse_mbscpy (&cmd_line[11], cmd);
#else
if (flags & QSE_PIO_MBSCMD)
@ -1264,7 +1264,7 @@ create_process:
qse_mchar_t* mptr;
qse_size_t mn;
#ifdef QSE_CHAR_IS_MCHAR
#if defined(QSE_CHAR_IS_MCHAR)
mn = qse_strlen(cmd);
cmd_line = qse_strdup2 (cmd, QSE_T(" "), pio->mmgr);
if (cmd_line == QSE_NULL)

View File

@ -430,7 +430,7 @@ static int getc (comp_t* com, int noesc)
}
}
}
#ifdef QSE_CHAR_IS_WCHAR
#if defined(QSE_CHAR_IS_WCHAR)
else if (c == QSE_T('u') && QSE_SIZEOF(qse_char_t) >= 2)
{
qse_char_t cx;

View File

@ -34,10 +34,10 @@
# endif
#endif
#ifdef HAVE_WCHAR_H
#if defined(HAVE_WCHAR_H)
# include <wchar.h>
#endif
#ifdef HAVE_STDLIB_H
#if defined(HAVE_STDLIB_H)
# include <stdlib.h>
#endif
#if defined(_WIN32)

View File

@ -406,7 +406,7 @@ int qse_timegm (const qse_btime_t* bt, qse_ntime_t* nt)
tm.tm_yday = bt->yday;
tm.tm_isdst = bt->isdst;
#ifdef HAVE_TIMEGM
#if defined(HAVE_TIMEGM)
*nt = ((qse_ntime_t)timegm(&tm)*QSE_MSECS_PER_SEC) + bt->msec;
return 0;
#else

View File

@ -236,7 +236,7 @@ int qse_tre_execx (
tre->errnum = QSE_TRE_EBADPAT;
return -1;
}
#ifdef QSE_CHAR_IS_WCHAR
#if defined(QSE_CHAR_IS_WCHAR)
ret = tre_match (tre, str, len, STR_WIDE, nmatch, pmatch, eflags);
#else
ret = tre_match (tre, str, len, STR_BYTE, nmatch, pmatch, eflags);

View File

@ -169,7 +169,7 @@ int qse_xma_init (qse_xma_t* xma, qse_mmgr_t* mmgr, qse_size_t zonesize)
xma->head = free;
/* initialize some statistical variables */
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.total = zonesize;
xma->stat.alloc = 0;
xma->stat.avail = zonesize - HDRSIZE;
@ -287,11 +287,11 @@ static qse_xma_blk_t* alloc_from_freelist (
/* add the remaining part to the free list */
attach_to_freelist (xma, tmp);
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.avail -= HDRSIZE;
#endif
}
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
else
{
/* decrement the number of free blocks as the current
@ -306,7 +306,7 @@ static qse_xma_blk_t* alloc_from_freelist (
free->f.prev = QSE_NULL;
*/
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.nused++;
xma->stat.alloc += free->size;
xma->stat.avail -= free->size;
@ -344,7 +344,7 @@ void* qse_xma_alloc (qse_xma_t* xma, qse_size_t size)
detach_from_freelist (xma, free);
free->avail = 0;
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.nfree--;
xma->stat.nused++;
xma->stat.alloc += free->size;
@ -445,7 +445,7 @@ static void* _realloc_merge (qse_xma_t* xma, void* b, qse_size_t size)
blk->b.next = tmp;
tmp->b.prev = blk;
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.alloc += req;
xma->stat.avail -= req; /* req + HDRSIZE(tmp) - HDRSIZE(n) */
#endif
@ -458,7 +458,7 @@ static void* _realloc_merge (qse_xma_t* xma, void* b, qse_size_t size)
blk->b.next = n->b.next;
if (n->b.next) n->b.next->b.prev = blk;
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.nfree--;
xma->stat.alloc += HDRSIZE + n->size;
xma->stat.avail -= n->size;
@ -496,7 +496,7 @@ static void* _realloc_merge (qse_xma_t* xma, void* b, qse_size_t size)
tmp->size = rem - HDRSIZE + HDRSIZE + n->size;
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.alloc -= rem;
/* rem - HDRSIZE(tmp) + HDRSIZE(n) */
xma->stat.avail += rem;
@ -513,7 +513,7 @@ static void* _realloc_merge (qse_xma_t* xma, void* b, qse_size_t size)
tmp->size = rem - HDRSIZE;
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.nfree++;
xma->stat.alloc -= rem;
xma->stat.avail += tmp->size;
@ -570,7 +570,7 @@ void qse_xma_free (qse_xma_t* xma, void* b)
/*QSE_ASSERT (blk->f.next == QSE_NULL);*/
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
/* update statistical variables */
xma->stat.nused--;
xma->stat.alloc -= blk->size;
@ -615,7 +615,7 @@ void qse_xma_free (qse_xma_t* xma, void* b)
attach_to_freelist (xma, x);
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.nfree--;
xma->stat.avail += ns;
#endif
@ -646,7 +646,7 @@ void qse_xma_free (qse_xma_t* xma, void* b)
qse_xma_blk_t* x = blk->b.next;
qse_xma_blk_t* y = x->b.next;
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.avail += blk->size + HDRSIZE;
#endif
@ -694,7 +694,7 @@ void qse_xma_free (qse_xma_t* xma, void* b)
qse_xma_blk_t* x = blk->b.prev;
qse_xma_blk_t* y = blk->b.next;
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.avail += HDRSIZE + blk->size;
#endif
@ -711,7 +711,7 @@ void qse_xma_free (qse_xma_t* xma, void* b)
blk->avail = 1;
attach_to_freelist (xma, blk);
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
xma->stat.nfree++;
xma->stat.avail += blk->size;
#endif
@ -722,13 +722,13 @@ void qse_xma_dump (qse_xma_t* xma, qse_xma_dumper_t dumper, void* ctx)
{
qse_xma_blk_t* tmp;
qse_ulong_t fsum, asum;
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
qse_ulong_t isum;
#endif
dumper (ctx, QSE_T("<XMA DUMP>\n"));
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
dumper (ctx, QSE_T("== statistics ==\n"));
#if (QSE_SIZEOF_SIZE_T == QSE_SIZEOF_LONG)
dumper (ctx, QSE_T("total = %lu\n"), (unsigned long)xma->stat.total);
@ -770,7 +770,7 @@ void qse_xma_dump (qse_xma_t* xma, qse_xma_dumper_t dumper, void* ctx)
else asum += tmp->size;
}
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
isum = (xma->stat.nfree + xma->stat.nused) * HDRSIZE;
#endif
@ -788,7 +788,7 @@ void qse_xma_dump (qse_xma_t* xma, qse_xma_dumper_t dumper, void* ctx)
# error weird size of qse_ulong_t. unsupported platform
#endif
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
#if (QSE_SIZEOF_ULONG_T == QSE_SIZEOF_LONG)
dumper (ctx, QSE_T("Internal use : %18lu bytes\n"), (unsigned long)isum);
dumper (ctx, QSE_T("Total : %18lu bytes\n"), (unsigned long)(asum + fsum + isum));
@ -803,7 +803,7 @@ void qse_xma_dump (qse_xma_t* xma, qse_xma_dumper_t dumper, void* ctx)
#endif
#endif
#ifdef QSE_XMA_ENABLE_STAT
#if defined(QSE_XMA_ENABLE_STAT)
QSE_ASSERT (asum == xma->stat.alloc);
QSE_ASSERT (fsum == xma->stat.avail);
QSE_ASSERT (isum == xma->stat.total - (xma->stat.alloc + xma->stat.avail));

View File

@ -87,14 +87,14 @@ struct qse_upxd_t
qse_uint8_t rbuf[65535];
};
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
int qse_upxd_init (qse_upxd_t* upxd, qse_mmgr_t* mmgr);
void qse_upxd_fini (qse_upxd_t* upxd);
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

View File

@ -691,7 +691,7 @@ Omitted for clash with regular expression \b.
break;
}
#ifdef QSE_CHAR_IS_WCHAR
#if defined(QSE_CHAR_IS_WCHAR)
case QSE_T('X'):
{
/* \Xnnnn or \Xnnnnnnnn for wchar_t */
@ -2479,7 +2479,7 @@ static int write_str_clearly (
if (QSE_ISPRINT(c)) WRITE_CHAR (sed, c);
else
{
#ifdef QSE_CHAR_IS_MCHAR
#if defined(QSE_CHAR_IS_MCHAR)
WRITE_CHAR (sed, QSE_T('\\'));
WRITE_NUM (sed, (unsigned char)c, 8, QSE_SIZEOF(qse_char_t)*3);
#else
@ -2579,7 +2579,7 @@ static int write_file (
{
qse_ssize_t n;
qse_sed_io_arg_t arg;
#ifdef QSE_CHAR_IS_MCHAR
#if defined(QSE_CHAR_IS_MCHAR)
qse_char_t buf[1024];
#else
qse_char_t buf[512];

View File

@ -216,7 +216,7 @@ struct qse_sed_t
} e;
};
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#endif
@ -234,7 +234,7 @@ const qse_char_t* qse_sed_dflerrstr (
qse_sed_errnum_t errnum
);
#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif