Abdelrazak Younes wrote:
Bo Peng wrote:
I will change scons using this logic.
Done fr scons: iconv is required, and ICONV_CONST is also defined in
common/config.h.
Hum, it does not work here Bo. common/config.h has:
/* Define as const if the declaration of iconv() needs const. */
#define ICONV_CONST
And we need "#define ICONV_CONST const" on win32. But the test seems to
pass correctly:
Check if the declaration of iconv needs const... yes
This patch fixes it for me. Can I commit?
Abdel.
Index: SConstruct
===================================================================
--- SConstruct (revision 14681)
+++ SConstruct (working copy)
@@ -1049,8 +1049,8 @@
(conf.CheckIconvConst(),
'ICONV_CONST',
'Define as const if the declaration of iconv() needs const.',
+ '#define ICONV_CONST const',
'#define ICONV_CONST',
- '#define ICONV_CONST const',
),
(conf.CheckLC_MESSAGES(),
'HAVE_LC_MESSAGES',
@@ -1232,8 +1232,8 @@
(conf.CheckIconvConst(),
'ICONV_CONST',
'Define as const if the declaration of iconv() needs
const.',
+ '#define ICONV_CONST const',
'#define ICONV_CONST',
- '#define ICONV_CONST const',
),
(conf.CheckType('intmax_t', includes='#include <stdint.h>') or
\
conf.CheckType('intmax_t', includes='#include <inttypes.h>'),
