[svn] assuan - r192 - trunk/src

[svn author marcus]

Author: marcus
Date: 2005-10-08 02:21:54 +0200 (Sat, 08 Oct 2005)
New Revision: 192

Modified:
   trunk/src/ChangeLog
   trunk/src/assuan-defs.h
   trunk/src/setenv.c
Log:
2005-10-08  Marcus Brinkmann  <marcus at g10code.de>

	* assuan-defs.h (setenv, unsetenv, clearenv) [!HAVE_SETENV]:
	Define to _assuan_*.
	* setenv.c: Include "assuan-defs.h".
	(__add_to_environ): Make static.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2005-10-07 00:40:45 UTC (rev 191)
+++ trunk/src/ChangeLog	2005-10-08 00:21:54 UTC (rev 192)
@@ -1,3 +1,10 @@
+2005-10-08  Marcus Brinkmann  <marcus at g10code.de>
+
+	* assuan-defs.h (setenv, unsetenv, clearenv) [!HAVE_SETENV]:
+	Define to _assuan_*.
+	* setenv.c: Include "assuan-defs.h".
+	(__add_to_environ): Make static.
+
 2005-10-07  Marcus Brinkmann  <marcus at g10code.de>
 
 	* assuan-defs.h (memrchr) [!HAVE_MEMRCHR]: New prototype.

Modified: trunk/src/assuan-defs.h
===================================================================
--- trunk/src/assuan-defs.h	2005-10-07 00:40:45 UTC (rev 191)
+++ trunk/src/assuan-defs.h	2005-10-08 00:21:54 UTC (rev 192)
@@ -259,6 +259,9 @@
 char *stpcpy (char *dest, const char *src);
 #endif
 #ifndef HAVE_SETENV
+#define setenv _assuan_setenv
+#define unsetenv _assuan_setenv
+#define clearenv _assuan_clearenv
 int setenv (const char *name, const char *value, int replace);
 #endif
 

Modified: trunk/src/setenv.c
===================================================================
--- trunk/src/setenv.c	2005-10-07 00:40:45 UTC (rev 191)
+++ trunk/src/setenv.c	2005-10-08 00:21:54 UTC (rev 192)
@@ -20,6 +20,8 @@
 # include <config.h>
 #endif
 
+#include "assuan-defs.h"
+
 #define __builtin_expect(cond,val) (cond)
 
 #include <errno.h>
@@ -108,7 +110,7 @@
    must be used directly.  This is all complicated by the fact that we try
    to reuse values once generated for a `setenv' call since we can never
    free the strings.  */
-int
+static int
 __add_to_environ (const char *name, const char *value, const char *combined,
 		  int replace)
 {