svn commit: samba r14362 - in branches/SAMBA_4_0/source: include librpc/ndr librpc/rpc pidl/lib/Parse/Pidl/Samba4/NDR

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-14 00:37:05 +0000 (Tue, 14 Mar 2006)
New Revision: 14362

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14362

Log:
Only include ndr_compression.h when necessary. 

Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm


Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2006-03-14 00:12:58 UTC (rev 14361)
+++ branches/SAMBA_4_0/source/include/includes.h	2006-03-14 00:37:05 UTC (rev 14362)
@@ -125,9 +125,6 @@
 #include "libcli/nbt/libnbt.h"
 #include "libcli/util/proto.h"
 
-/* FIXME: This header should be included by pidl where necessary */
-#include "librpc/ndr/ndr_compression.h"
-
 #undef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2)
 

Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h	2006-03-14 00:12:58 UTC (rev 14361)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h	2006-03-14 00:37:05 UTC (rev 14362)
@@ -34,6 +34,7 @@
 	struct SECURITYBINDING **securitybindings;
 };
 
+#include "librpc/gen_ndr/orpc.h"
 #include "librpc/ndr/ndr_orpc_proto.h"
 
 #endif /* __NDR_ORPC_H__ */

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h	2006-03-14 00:12:58 UTC (rev 14361)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h	2006-03-14 00:37:05 UTC (rev 14362)
@@ -24,6 +24,8 @@
 #ifndef __DCERPC_H__
 #define __DCERPC_H__
 
+#include "librpc/gen_ndr/dcerpc.h"
+
 enum dcerpc_transport_t {
 	NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, NCACN_VNS_SPP, 
 	NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM, NCADG_UNIX_DGRAM,

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2006-03-14 00:12:58 UTC (rev 14361)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2006-03-14 00:37:05 UTC (rev 14362)
@@ -2307,6 +2307,10 @@
 
 	pidl_hdr "";
 
+	if ($needed->{"compression"}) {
+		pidl "#include \"librpc/ndr/ndr_compression.h\"";
+	}
+	
 	HeaderInterface($interface);
 
 	# Typedefs
@@ -2403,6 +2407,9 @@
 
 		for my $e (@{$t->{DATA}->{ELEMENTS}}) {
 			$e->{PARENT} = $t->{DATA};
+			if (has_property($e, "compression")) { 
+				$needed->{"compression"} = 1;
+			}
 			if ($needed->{"pull_$t->{NAME}"} and
 				not defined($needed->{"pull_$e->{TYPE}"})) {
 				$needed->{"pull_$e->{TYPE}"} = 1;