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

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

Browse Source
This commit is contained in:
hyung-hwan
2014-11-14 02:44:20 +00:00
parent 3db3396955
commit 0b286a7e2a
68 changed files with 156 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qse/lib/cmn/chr.c
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",

4
qse/lib/cmn/fmt.h
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

4
qse/lib/cmn/fs.h
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

2
qse/lib/cmn/mem.h
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)

8
qse/lib/cmn/pio.c
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)

2
qse/lib/cmn/rex.c
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;

4
qse/lib/cmn/slmb.c
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)

2
qse/lib/cmn/time.c
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

2
qse/lib/cmn/tre.c
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);

38
qse/lib/cmn/xma.c
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));