heimdal:lib/krb5: don't name a struct 'token'
This is a static const struct and the name is never used, so just make it an anonymous struct. This hopefully fixes the build on AIX: "../lib/roken/roken-common.h", line 276.9: 1506-236 (W) Macro name __attribute__ has been redefined. "../lib/roken/roken-common.h", line 276.9: 1506-358 (I) "__attribute__" is defined on line 45 of ../lib/com_err/com_err.h. "../lib/krb5/expand_path.c", line 331.21: 1506-334 (S) Identifier token has already been defined on line 98 of "/usr/include/net/if_arp.h". "../lib/krb5/expand_path.c", line 390.43: 1506-019 (S) Expecting an array or a pointer to object type. "../lib/krb5/expand_path.c", line 391.31: 1506-019 (S) Expecting an array or a pointer to object type. "../lib/krb5/expand_path.c", line 392.20: 1506-019 (S) Expecting an array or a pointer to object type. "../lib/krb5/expand_path.c", line 392.48: 1506-019 (S) Expecting an array or a pointer to object type. "../lib/krb5/expand_path.c", line 393.39: 1506-019 (S) Expecting an array or a pointer to object type. Waf: Leaving directory `/opt/home/build/build_farm/samba_4_0_test/bin' Build failed: -> task failed (err #1): {task: cc expand_path.c -> expand_path_52.o} gmake: *** [all] Error 1 metze Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Sat Jun 16 15:20:59 CEST 2012 on sn-devel-104
This commit is contained in:
		 Stefan Metzmacher
					Stefan Metzmacher
				
			
				
					committed by
					
						 Nicolas Williams
						Nicolas Williams
					
				
			
			
				
	
			
			
			 Nicolas Williams
						Nicolas Williams
					
				
			
						parent
						
							c281ad6ccb
						
					
				
				
					commit
					506780a160
				
			| @@ -332,7 +332,7 @@ _expand_null(krb5_context context, PTYPE param, const char *postfix, char **ret) | ||||
| } | ||||
|  | ||||
|  | ||||
| static const struct token { | ||||
| static const struct { | ||||
|     const char * tok; | ||||
|     int ftype; | ||||
| #define FTYPE_CSIDL 0 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user