[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  55dba7b s4:cluster/cluster.h - fix another gcc 3.4 "struct" warning
       via  84c95bf s4:dsdb/samdb/ldb_modules/util.h - fix a gcc 3.4 compile warning
       via  67318d1 s4:lib/messaging/*.h - fix compile warnings on gcc 3.4
      from  8897935 pytalloc: Add docstring for talloc.Object.

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


- Log -----------------------------------------------------------------
commit 55dba7bd160e1514d06f6361879c5b789e64aca8
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Dec 5 20:31:09 2010 +0100

    s4:cluster/cluster.h - fix another gcc 3.4 "struct" warning
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Sun Dec  5 21:22:18 CET 2010 on sn-devel-104

commit 84c95bf88e3511df1818c6cf11ba3c97b830398e
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Dec 5 20:28:44 2010 +0100

    s4:dsdb/samdb/ldb_modules/util.h - fix a gcc 3.4 compile warning

commit 67318d18c12a22057fb0cc8cf84372c20897a92d
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Dec 5 20:24:18 2010 +0100

    s4:lib/messaging/*.h - fix compile warnings on gcc 3.4
    
    For example on OpenSolaris

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

Summary of changes:
 source4/cluster/cluster.h             |    2 ++
 source4/dsdb/samdb/ldb_modules/util.h |    2 +-
 source4/lib/messaging/irpc.h          |    1 -
 source4/lib/messaging/messaging.h     |    4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h
index 7545757..8de58a3 100644
--- a/source4/cluster/cluster.h
+++ b/source4/cluster/cluster.h
@@ -22,6 +22,8 @@
 #ifndef __CLUSTER_H__
 #define __CLUSTER_H__ 
 
+#include "librpc/gen_ndr/server_id.h"
+
 /*
   test for same cluster id
 */
diff --git a/source4/dsdb/samdb/ldb_modules/util.h b/source4/dsdb/samdb/ldb_modules/util.h
index 0d4b692..e37b0b7 100644
--- a/source4/dsdb/samdb/ldb_modules/util.h
+++ b/source4/dsdb/samdb/ldb_modules/util.h
@@ -21,12 +21,12 @@
 
 /* predeclare some structures used by utility functions */
 struct dsdb_schema;
-struct GUID;
 struct dsdb_attribute;
 struct dsdb_fsmo_extended_op;
 struct security_descriptor;
 struct dom_sid;
 
+#include "librpc/gen_ndr/misc.h"
 #include "dsdb/samdb/ldb_modules/util_proto.h"
 #include "dsdb/common/util.h"
 
diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h
index 5236021..bdb1b8f 100644
--- a/source4/lib/messaging/irpc.h
+++ b/source4/lib/messaging/irpc.h
@@ -24,7 +24,6 @@
 
 #include "lib/messaging/messaging.h"
 #include "librpc/gen_ndr/irpc.h"
-#include "librpc/gen_ndr/server_id.h"
 
 /*
   an incoming irpc message
diff --git a/source4/lib/messaging/messaging.h b/source4/lib/messaging/messaging.h
index 274ba0b..75990e3 100644
--- a/source4/lib/messaging/messaging.h
+++ b/source4/lib/messaging/messaging.h
@@ -21,9 +21,9 @@
 #ifndef _MESSAGES_H_
 #define _MESSAGES_H_
 
-struct messaging_context;
-struct server_id;
+#include "librpc/gen_ndr/server_id.h"
 
+struct messaging_context;
 
 /* general messages */
 #define MSG_DEBUG		1


-- 
Samba Shared Repository