[svn] assuan - r333 - trunk/src

[svn author marcus]

Author: marcus
Date: 2009-12-08 21:52:28 +0100 (Tue, 08 Dec 2009)
New Revision: 333

Modified:
   trunk/src/ChangeLog
   trunk/src/assuan.h
Log:
2009-12-08  Marcus Brinkmann  <marcus at g10code.de>

	* assuan.h (struct assuan_system_hooks): Don't use "namespace" as
	argument name in declaration (C++ keyword).


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-12-08 17:28:11 UTC (rev 332)
+++ trunk/src/ChangeLog	2009-12-08 20:52:28 UTC (rev 333)
@@ -1,5 +1,8 @@
 2009-12-08  Marcus Brinkmann  <marcus at g10code.de>
 
+	* assuan.h (struct assuan_system_hooks): Don't use "namespace" as
+	argument name in declaration (C++ keyword).
+
 	* client.c (assuan_client_read_response): Fix linelen.
 
 	* assuan.h (ASSUAN_SPAWN_DETACHED): New macro.

Modified: trunk/src/assuan.h
===================================================================
--- trunk/src/assuan.h	2009-12-08 17:28:11 UTC (rev 332)
+++ trunk/src/assuan.h	2009-12-08 20:52:28 UTC (rev 333)
@@ -293,7 +293,7 @@
   /* If action is 0, like waitpid.  If action is 1, just release the PID?  */
   pid_t (*waitpid) (assuan_context_t ctx, pid_t pid,
 		    int action, int *status, int options);
-  int (*socketpair) (assuan_context_t ctx, int namespace, int style,
+  int (*socketpair) (assuan_context_t ctx, int _namespace, int style,
 		     int protocol, assuan_fd_t filedes[2]);
 };
 typedef struct assuan_system_hooks *assuan_system_hooks_t;