[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  bd45745 heimdal:lib/krb5: don't name a struct 'token'
      from  4edd8b8 s3-auth: Remove auth_netlogond

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bd45745b09380c1fa6d0fd32929bd298fdaa4146
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Jun 16 13:25:18 2012 +0200

    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:
    
    "../source4/heimdal/lib/roken/roken-common.h", line 276.9: 1506-236 (W) Macro name __attribute__ has been redefined.
    "../source4/heimdal/lib/roken/roken-common.h", line 276.9: 1506-358 (I) "__attribute__" is defined on line 45 of ../source4/heimdal/lib/com_err/com_err.h.
    "../source4/heimdal/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".
    "../source4/heimdal/lib/krb5/expand_path.c", line 390.43: 1506-019 (S) Expecting an array or a pointer to object type.
    "../source4/heimdal/lib/krb5/expand_path.c", line 391.31: 1506-019 (S) Expecting an array or a pointer to object type.
    "../source4/heimdal/lib/krb5/expand_path.c", line 392.20: 1506-019 (S) Expecting an array or a pointer to object type.
    "../source4/heimdal/lib/krb5/expand_path.c", line 392.48: 1506-019 (S) Expecting an array or a pointer to object type.
    "../source4/heimdal/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 at samba.org>
    Autobuild-Date(master): Sat Jun 16 15:20:59 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/heimdal/lib/krb5/expand_path.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal/lib/krb5/expand_path.c b/source4/heimdal/lib/krb5/expand_path.c
index 4c4898a..1b46cea 100644
--- a/source4/heimdal/lib/krb5/expand_path.c
+++ b/source4/heimdal/lib/krb5/expand_path.c
@@ -328,7 +328,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


-- 
Samba Shared Repository