[Pkg-gnupg-commit] [libassuan] 147/437: 2005-10-08 Marcus Brinkmann <marcus at g10code.de>

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit 33ec4648752ee1d8f73763cdc1a030f39959c8b5
Author: Marcus Brinkmann <mb at g10code.com>
Date:   Sat Oct 8 00:21:54 2005 +0000

    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.
---
 src/ChangeLog     | 7 +++++++
 src/assuan-defs.h | 3 +++
 src/setenv.c      | 4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 31425ae..5b6eda4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/assuan-defs.h b/src/assuan-defs.h
index e5a50b3..89254fb 100644
--- a/src/assuan-defs.h
+++ b/src/assuan-defs.h
@@ -259,6 +259,9 @@ void *memrchr (const void *block, int c, size_t size);
 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
 
diff --git a/src/setenv.c b/src/setenv.c
index 16670f3..8fe53b2 100644
--- a/src/setenv.c
+++ b/src/setenv.c
@@ -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 @@ static char **last_environ;
    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)
 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git