samba - Jan 2005 - 3.0.x and AIX 5.3

As of AIX 5.3 sys/var.h is loaded in sys/proc.h & sys/space.h which are
loaded through a rather lengthy debacle of nested includes. AIX 5.2 does
not have this problem.


At any rate the result when using gcc 3.3 and vac 6.x:

Compiling web/cgi.c
web/cgi.c:33: error: redefinition of `struct var'
web/cgi.c: In function `cgi_load_variables':
web/cgi.c:138: error: structure has no member named `name'
web/cgi.c:139: error: structure has no member named `value'
...


Attached is a simple fix that just renames the "struct var" to
"struct
cgi_var". 3.0.10 and 3.0.11pre1 compile successfully on 5.3 after this
change.


Bill
-------------- next part --------------
--- cgi.orig.c	2005-01-05 17:03:29.000000000 -0500
+++ cgi.aix.c	2005-01-05 17:04:03.000000000 -0500
@@ -30,12 +30,12 @@
 extern void print_title(char *fmt, ...);
 #endif
 
-struct var {
+struct cgi_var {
 	char *name;
 	char *value;
 };
 
-static struct var variables[MAX_VARIABLES];
+static struct cgi_var variables[MAX_VARIABLES];
 static int num_variables;
 static int content_length;
 static int request_post;

On Wed, Jan 05, 2005 at 05:14:09PM -0500, William Jojo
wrote:
> 
> 
> As of AIX 5.3 sys/var.h is loaded in sys/proc.h & sys/space.h which are
> loaded through a rather lengthy debacle of nested includes. AIX 5.2 does
> not have this problem.
> 
> 
> At any rate the result when using gcc 3.3 and vac 6.x:
> 
> Compiling web/cgi.c
> web/cgi.c:33: error: redefinition of `struct var'
> web/cgi.c: In function `cgi_load_variables':
> web/cgi.c:138: error: structure has no member named `name'
> web/cgi.c:139: error: structure has no member named `value'
> ...
> 
> 
> Attached is a simple fix that just renames the "struct var" to
"struct
> cgi_var". 3.0.10 and 3.0.11pre1 compile successfully on 5.3 after this
> change.
Applied, thanks !

Jeremy.