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

fixed definitions of INLINE macros for old gcc

Browse Source
This commit is contained in:
hyung-hwan
2014-04-21 15:34:57 +00:00
parent cfb3eb93ec
commit 257dbbb586
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@
# undef QSE_HAVE_INLINE # undef QSE_HAVE_INLINE
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__) && defined(__GNUC_GNU_INLINE__)
# define QSE_INLINE_ALWAYS inline __attribute__((__always_inline__)) # define QSE_INLINE_ALWAYS inline __attribute__((__always_inline__))
# define QSE_HAVE_INLINE_ALWAYS # define QSE_HAVE_INLINE_ALWAYS
#elif defined(_MSC_VER) || (defined(__CC_ARM) || defined(__ARMCC__)) #elif defined(_MSC_VER) || (defined(__CC_ARM) || defined(__ARMCC__))
@ -53,7 +53,7 @@
# undef QSE_HAVE_INLINE_ALWAYS # undef QSE_HAVE_INLINE_ALWAYS
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__) && defined(__GNUC_GNU_INLINE__)
# define QSE_INLINE_NEVER inline __attribute__((__noinline__)) # define QSE_INLINE_NEVER inline __attribute__((__noinline__))
# define QSE_HAVE_INLINE_NEVER # define QSE_HAVE_INLINE_NEVER
#elif (defined(__CC_ARM) || defined(__ARMCC__)) #elif (defined(__CC_ARM) || defined(__ARMCC__))

6
qse/lib/awk/StdAwk.cpp
View File

@ -501,7 +501,8 @@ int StdAwk::setioattr (
return ret.setInt ((int_t)0); return ret.setInt ((int_t)0);
} }
#if defined(QSE_CHAR_IS_WCHAR) #if defined(QSE_CHAR_IS_WCHAR)
else if (qse_strcasecmp (ptr[1], QSE_T("codepage")) == 0) else if (qse_strcasecmp (ptr[1], QSE_T("codepage")) == 0 ||
qse_strcasecmp (ptr[1], QSE_T("encoding")) == 0)
{ {
ioattr_t* ioattr; ioattr_t* ioattr;
qse_cmgr_t* cmgr; qse_cmgr_t* cmgr;
@ -557,7 +558,8 @@ int StdAwk::getioattr (
xx = args[2].setFlt ((qse_awk_flt_t)ioattr->tmout[tmout].sec + QSE_NSEC_TO_SEC((qse_awk_flt_t)ioattr->tmout[tmout].nsec)); xx = args[2].setFlt ((qse_awk_flt_t)ioattr->tmout[tmout].sec + QSE_NSEC_TO_SEC((qse_awk_flt_t)ioattr->tmout[tmout].nsec));
} }
#if defined(QSE_CHAR_IS_WCHAR) #if defined(QSE_CHAR_IS_WCHAR)
else if (qse_strcasecmp (ptr[1], QSE_T("codepage")) == 0) else if (qse_strcasecmp (ptr[1], QSE_T("codepage")) == 0 ||
qse_strcasecmp (ptr[1], QSE_T("encoding")) == 0)
{ {
xx = args[2].setStr (ioattr->cmgr_name); xx = args[2].setStr (ioattr->cmgr_name);
} }

6
qse/lib/awk/std.c
View File

@ -2375,7 +2375,8 @@ static int fnc_setioattr (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
} }
} }
#if defined(QSE_CHAR_IS_WCHAR) #if defined(QSE_CHAR_IS_WCHAR)
else if (qse_strcasecmp (ptr[1], QSE_T("codepage")) == 0) else if (qse_strcasecmp (ptr[1], QSE_T("codepage")) == 0 ||
qse_strcasecmp (ptr[1], QSE_T("encoding")) == 0)
{ {
ioattr_t* ioattr; ioattr_t* ioattr;
qse_cmgr_t* cmgr; qse_cmgr_t* cmgr;
@ -2478,7 +2479,8 @@ static int fnc_getioattr (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
} }
} }
#if defined(QSE_CHAR_IS_WCHAR) #if defined(QSE_CHAR_IS_WCHAR)
else if (qse_strcasecmp (ptr[1], QSE_T("codepage")) == 0) else if (qse_strcasecmp (ptr[1], QSE_T("codepage")) == 0 ||
qse_strcasecmp (ptr[1], QSE_T("encoding")) == 0)
{ {
rv = qse_awk_rtx_makestrvalwithstr (rtx, ioattr->cmgr_name); rv = qse_awk_rtx_makestrvalwithstr (rtx, ioattr->cmgr_name);
if (rv == QSE_NULL) if (rv == QSE_NULL)