[SCM] Samba Shared Repository - branch master updated - ec1e831bd8791e7b2c373f1119e1d3e33b06e152

[Stefan Metzmacher]

The branch, master has been updated
       via  ec1e831bd8791e7b2c373f1119e1d3e33b06e152 (commit)
       via  96266d2f50b2f68e29c811908efecb78895e49bd (commit)
      from  76d53e7648869bbdc83be1e07941467019b96321 (commit)

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


- Log -----------------------------------------------------------------
commit ec1e831bd8791e7b2c373f1119e1d3e33b06e152
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 2 16:26:00 2009 +0100

    librpc/gen_ndr: rerun make idl_full after pidl changes
    
    metze

commit 96266d2f50b2f68e29c811908efecb78895e49bd
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 2 16:22:18 2009 +0100

    pidl: add dummy element for empty unions
    
    This hopefully fixes the build on Solaris and IRIX.
    
    metze

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

Summary of changes:
 librpc/gen_ndr/named_pipe_auth.h     |    1 +
 pidl/lib/Parse/Pidl/Samba4/Header.pm |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/named_pipe_auth.h b/librpc/gen_ndr/named_pipe_auth.h
index 5f4ba9a..8f2446e 100644
--- a/librpc/gen_ndr/named_pipe_auth.h
+++ b/librpc/gen_ndr/named_pipe_auth.h
@@ -19,6 +19,7 @@ struct named_pipe_auth_req {
 }/* [gensize,public] */;
 
 union named_pipe_auth_rep_info {
+	int _dummy_element;
 }/* [switch_type(uint32)] */;
 
 struct named_pipe_auth_rep {
diff --git a/pidl/lib/Parse/Pidl/Samba4/Header.pm b/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 94e1efb..0411466 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Header.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Header.pm
@@ -183,14 +183,20 @@ sub HeaderUnion($$;$)
 	return if (not defined($union->{ELEMENTS}));
 	pidl " {\n";
 	$tab_depth++;
+	my $needed = 0;
 	foreach my $e (@{$union->{ELEMENTS}}) {
 		if ($e->{TYPE} ne "EMPTY") {
 			if (! defined $done{$e->{NAME}}) {
 				HeaderElement($e);
 			}
 			$done{$e->{NAME}} = 1;
+			$needed++;
 		}
 	}
+	if (!$needed) {
+		# sigh - some compilers don't like empty structures
+		pidl tabs()."int _dummy_element;\n";
+	}
 	$tab_depth--;
 	pidl "}";
 


-- 
Samba Shared Repository