Attachment #309303 for bug #412389

Lines 313-319 def DoConfigure(): Link Here

(-)a/SConstruct (-1 / +2 lines)
313	conf.CheckCHeader('sys/param.h')	313	conf.CheckCHeader('sys/param.h')
314	conf.CheckCHeader('sys/stat.h')	314	conf.CheckCHeader('sys/stat.h')
315	conf.CheckCHeader('sys/types.h')	315	conf.CheckCHeader('sys/types.h')
316	conf.CheckCHeader('unistd.h')	316	if conf.CheckCHeader('unistd.h'):
		317	conf.Define('DHAVE_UNISTD_H', 1)
317	conf.CheckCHeader('wchar.h')	318	conf.CheckCHeader('wchar.h')
318		319
319	# add essential package requirements	320	# add essential package requirements




#include <string>
#include <cstring>

#if defined(HAVE_UNISTD_H)
#include <unistd.h>
#ifdef __cplusplus
#include <algorithm>
#else
#include <sys/ddi.h>
#endif //__cpluscplus
#endif //defined(HAVE_UNISTD_H)


#ifndef HOST_OS_GNUC_2
    #if defined(DEBUG) && !defined(NDEBUG)
- 

Return to bug 412389

Lines 44-58 Link Here

(-)a/src/portability.h (-4 / +2 lines)
44	#include <string>	44	#include <string>
45	#include <cstring>	45	#include <cstring>
46		46
47	#if defined(sun)	47	#if defined(HAVE_UNISTD_H)
48	#include <unistd.h>	48	#include <unistd.h>
49	#ifdef __cplusplus	49	#ifdef __cplusplus
50	#include <algorithm>	50	#include <algorithm>
51	#else	51	#else
52	#include <sys/ddi.h>	52	#include <sys/ddi.h>
53	#endif //__cpluscplus	53	#endif //__cpluscplus
54	#endif //defined(sun)	54	#endif //defined(HAVE_UNISTD_H)
55
56		55
57	#ifndef HOST_OS_GNUC_2	56	#ifndef HOST_OS_GNUC_2
58	#if defined(DEBUG) && !defined(NDEBUG)	57	#if defined(DEBUG) && !defined(NDEBUG)
59	-