>From f374699d4e847767650a994ce87d77d8b257ff61 Mon Sep 17 00:00:00 2001 From: Peter Bex Date: Thu, 20 Feb 2014 22:07:01 +0100 Subject: [PATCH 6/6] Fix unsetenv() on Solaris, and start an effort to get rid of the strange "GNU_ENV" definition --- Makefile.aix | 1 + Makefile.bsd | 1 + Makefile.haiku | 1 + Makefile.hurd | 1 + Makefile.linux | 1 + Makefile.macosx | 1 + Makefile.solaris | 1 + posix-common.scm | 2 +- 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.aix b/Makefile.aix index 724bca6..7766734 100644 --- a/Makefile.aix +++ b/Makefile.aix @@ -90,6 +90,7 @@ chicken-config.h: chicken-defaults.h echo "#define HAVE_STRTOQ 0" >>$@ echo "#define HAVE_SYS_STAT_H 1" >>$@ echo "#define HAVE_SYS_TYPES_H 1" >>$@ + echo "#define HAVE_SETENV 1" >>$@ echo "#define HAVE_UNISTD_H 1" >>$@ echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>$@ echo "#define STDC_HEADERS 1" >>$@ diff --git a/Makefile.bsd b/Makefile.bsd index 4dd003f..9006d86 100644 --- a/Makefile.bsd +++ b/Makefile.bsd @@ -92,6 +92,7 @@ chicken-config.h: chicken-defaults.h echo "#define HAVE_STRTOQ 1" >>$@ echo "#define HAVE_SYS_STAT_H 1" >>$@ echo "#define HAVE_SYS_TYPES_H 1" >>$@ + echo "#define HAVE_SETENV 1" >>$@ echo "#define HAVE_UNISTD_H 1" >>$@ echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>$@ echo "#define STDC_HEADERS 1" >>$@ diff --git a/Makefile.haiku b/Makefile.haiku index 58c2c72..749fbc3 100644 --- a/Makefile.haiku +++ b/Makefile.haiku @@ -84,6 +84,7 @@ chicken-config.h: chicken-defaults.h echo "#define HAVE_STRTOQ 1" >>$@ echo "#define HAVE_SYS_STAT_H 1" >>$@ echo "#define HAVE_SYS_TYPES_H 1" >>$@ + echo "#define HAVE_SETENV 1" >>$@ echo "#define HAVE_UNISTD_H 1" >>$@ echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>$@ echo "#define STDC_HEADERS 1" >>$@ diff --git a/Makefile.hurd b/Makefile.hurd index 59dad05..cbb0176 100644 --- a/Makefile.hurd +++ b/Makefile.hurd @@ -85,6 +85,7 @@ chicken-config.h: chicken-defaults.h echo "#define HAVE_STRTOQ 1" >>$@ echo "#define HAVE_SYS_STAT_H 1" >>$@ echo "#define HAVE_SYS_TYPES_H 1" >>$@ + echo "#define HAVE_SETENV 1" >>$@ echo "#define HAVE_UNISTD_H 1" >>$@ echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>$@ echo "#define STDC_HEADERS 1" >>$@ diff --git a/Makefile.linux b/Makefile.linux index 36d5c36..ee8161e 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -85,6 +85,7 @@ chicken-config.h: chicken-defaults.h echo "#define HAVE_STRTOQ 1" >>$@ echo "#define HAVE_SYS_STAT_H 1" >>$@ echo "#define HAVE_SYS_TYPES_H 1" >>$@ + echo "#define HAVE_SETENV 1" >>$@ echo "#define HAVE_UNISTD_H 1" >>$@ echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>$@ echo "#define STDC_HEADERS 1" >>$@ diff --git a/Makefile.macosx b/Makefile.macosx index 1a29aef..d013490 100644 --- a/Makefile.macosx +++ b/Makefile.macosx @@ -115,6 +115,7 @@ chicken-config.h: chicken-defaults.h echo "#define HAVE_STRTOQ 1" >>$@ echo "#define HAVE_SYS_STAT_H 1" >>$@ echo "#define HAVE_SYS_TYPES_H 1" >>$@ + echo "#define HAVE_SETENV 1" >>$@ echo "#define HAVE_UNISTD_H 1" >>$@ echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>$@ echo "#define STDC_HEADERS 1" >>$@ diff --git a/Makefile.solaris b/Makefile.solaris index 75b60b2..9ce111e 100644 --- a/Makefile.solaris +++ b/Makefile.solaris @@ -115,6 +115,7 @@ chicken-config.h: chicken-defaults.h echo "#define HAVE_STRTOLL 1" >>$@ echo "#define HAVE_SYS_STAT_H 1" >>$@ echo "#define HAVE_SYS_TYPES_H 1" >>$@ + echo "#define HAVE_SETENV 1" >>$@ echo "#define HAVE_UNISTD_H 1" >>$@ echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>$@ echo "#define STDC_HEADERS 1" >>$@ diff --git a/posix-common.scm b/posix-common.scm index 93884de..0a04ccc 100644 --- a/posix-common.scm +++ b/posix-common.scm @@ -96,7 +96,7 @@ static char C_time_string [TIME_STRING_MAXLENGTH + 1]; #define C_readdir(h,e) C_set_block_item(e, 0, (C_word) readdir((DIR *)C_block_item(h, 0))) #define C_foundfile(e,b,l) (C_strlcpy(C_c_string(b), ((struct dirent *) C_block_item(e, 0))->d_name, l), C_fix(strlen(((struct dirent *) C_block_item(e, 0))->d_name))) -#ifdef C_GNU_ENV +#ifdef HAVE_SETENV # define C_unsetenv(s) (unsetenv((char *)C_data_pointer(s)), C_SCHEME_TRUE) # define C_setenv(x, y) C_fix(setenv((char *)C_data_pointer(x), (char *)C_data_pointer(y), 1)) #else -- 1.7.10.4