Skip to content

Commit 026747b

Browse files
committed
Portability fix.
1 parent d1126b7 commit 026747b

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2002-05-24 Bruno Haible <bruno@clisp.org>
2+
3+
* lib/jisx0213.h: Use 'inline' only conditionally.
4+
15
2002-05-18 Bruno Haible <bruno@clisp.org>
26

37
* configure.in (AC_INIT), include/iconv.h.in (_LIBICONV_VERSION),

lib/jisx0213.h

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5844,7 +5844,14 @@ static const Summary16 jisx0213_from_ucs_level2_2indx[] = {
58445844
{ 11197, 0x0000 }, { 11197, 0x0000 }, { 11197, 0x0000 }, { 11197, 0x0004 },
58455845
};
58465846

5847-
static inline ucs4_t jisx0213_to_ucs4 (unsigned int row, unsigned int col)
5847+
#ifdef __GNUC__
5848+
__inline
5849+
#else
5850+
#ifdef __cplusplus
5851+
inline
5852+
#endif
5853+
#endif
5854+
static ucs4_t jisx0213_to_ucs4 (unsigned int row, unsigned int col)
58485855
{
58495856
ucs4_t val;
58505857

@@ -5875,7 +5882,14 @@ static inline ucs4_t jisx0213_to_ucs4 (unsigned int row, unsigned int col)
58755882
return val;
58765883
}
58775884

5878-
static inline unsigned short ucs4_to_jisx0213 (ucs4_t ucs)
5885+
#ifdef __GNUC__
5886+
__inline
5887+
#else
5888+
#ifdef __cplusplus
5889+
inline
5890+
#endif
5891+
#endif
5892+
static unsigned short ucs4_to_jisx0213 (ucs4_t ucs)
58795893
{
58805894
if (ucs < (sizeof(jisx0213_from_ucs_level1)/sizeof(jisx0213_from_ucs_level1[0])) << 6) {
58815895
int index1 = jisx0213_from_ucs_level1[ucs >> 6];

0 commit comments

Comments
 (0)