Bo Peng wrote:
>> Please test attached patch. It does work with cmake and msvc.
>>
>
> Works for me. I get ICONV_CONST const under linux. If Abdel can
> confirm under windows, I will apply.
>
> Bo
>
>
As I understand it it MUST NOT be const under Linux and const
on windows, maybe we need a inverted ICONV_CONST definition
see Abdel's patch:
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>'),
Peter
