projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assume vprintf.
[gnulib.git]
/
lib
/
putenv.c
diff --git
a/lib/putenv.c
b/lib/putenv.c
index
0b1e664
..
87c5522
100644
(file)
--- a/
lib/putenv.c
+++ b/
lib/putenv.c
@@
-33,27
+33,19
@@
extern int errno;
# define __set_errno(ev) ((errno) = (ev))
#endif
# define __set_errno(ev) ((errno) = (ev))
#endif
-/* Don't include stdlib.h because some (e.g., Solaris
2.
7) declare putenv
+/* Don't include stdlib.h because some (e.g., Solaris 7) declare putenv
with a non-const argument. That would conflict with the declaration of
rpl_putenv below (due to the #define putenv rpl_putenv from config.h). */
with a non-const argument. That would conflict with the declaration of
rpl_putenv below (due to the #define putenv rpl_putenv from config.h). */
-
char
*malloc ();
+
void
*malloc ();
void free ();
void free ();
-#if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
-# include <string.h>
-#endif
+#include <string.h>
+
#if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
# include <unistd.h>
#endif
#if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
# include <unistd.h>
#endif
-#if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
-# define strchr index
-#endif
-#if !defined (__GNU_LIBRARY__) && !defined (HAVE_MEMCPY)
-# define memcpy(d,s,n) bcopy ((s), (d), (n))
-#endif
-
#if HAVE_GNU_LD
# define environ __environ
#else
#if HAVE_GNU_LD
# define environ __environ
#else
@@
-71,10
+63,6
@@
__libc_lock_define_initialized (static, envlock)
# define UNLOCK
#endif
# define UNLOCK
#endif
-#ifndef NULL
-# define NULL 0
-#endif
-
static int
unsetenv (const char *name)
{
static int
unsetenv (const char *name)
{