AIX 5.3 and Samba 3.0.x

[William Jojo]

As of 5.3, AIX now loads sys/var.h in:

sys/proc.h & sys/space.h which is loaded through a rather lengthy debacle
of nested includes.


At any rate the result:

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 compiles successfully on 5.3 after this change.



Bill
-------------- next part --------------
*** cgi.orig.c	Thu Dec 16 16:46:21 2004
--- cgi.aix.c	Thu Dec 16 16:48:36 2004
***************
*** 30,41 ****
  extern void print_title(char *fmt, ...);
  #endif
  
! struct var {
  	char *name;
  	char *value;
  };
  
! static struct var variables[MAX_VARIABLES];
  static int num_variables;
  static int content_length;
  static int request_post;
--- 30,41 ----
  extern void print_title(char *fmt, ...);
  #endif
  
! struct cgi_var {
  	char *name;
  	char *value;
  };
  
! static struct cgi_var variables[MAX_VARIABLES];
  static int num_variables;
  static int content_length;
  static int request_post;