svn commit: samba r18254 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR: .

[tridge at samba.org]

Author: tridge
Date: 2006-09-08 05:43:08 +0000 (Fri, 08 Sep 2006)
New Revision: 18254

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

Log:

reverted r18231

Jelmer, older versions of gcc don't support visibility("default"). See
for example the CentOS build here:

  http://build.samba.org/?function=View+Build;host=lithium;tree=samba4;compiler=gcc;revision=18253

Is there some other way you can think of to do this?

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm


Changeset:
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-09-08 05:24:44 UTC (rev 18253)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2006-09-08 05:43:08 UTC (rev 18254)
@@ -208,8 +208,7 @@
 
 	if (has_property($fn, "public")) {
 		pidl_hdr "$decl;";
-		pidl "__attribute__((visibility(\"default\")))";
-		pidl "$decl";
+		pidl "_PUBLIC_ $decl";
 	} else {
 		pidl "static $decl";
 	}
@@ -1880,8 +1879,7 @@
 
 	return if (has_property($e, "noprint"));
 
-	pidl "__attribute__((visibility(\"default\")))";
-	pidl "void ndr_print_$e->{NAME}(struct ndr_print *ndr, const char *name, $args)";
+	pidl "_PUBLIC_ void ndr_print_$e->{NAME}(struct ndr_print *ndr, const char *name, $args)";
 	pidl "{";
 	indent;
 	$typefamily{$e->{DATA}->{TYPE}}->{PRINT_FN_BODY}->($e->{DATA}, $e->{NAME});
@@ -1919,8 +1917,7 @@
 
 	return if has_property($fn, "noprint");
 
-	pidl "__attribute__((visibility(\"default\")))";
-	pidl "void ndr_print_$fn->{NAME}(struct ndr_print *ndr, const char *name, int flags, const struct $fn->{NAME} *r)";
+	pidl "_PUBLIC_ void ndr_print_$fn->{NAME}(struct ndr_print *ndr, const char *name, int flags, const struct $fn->{NAME} *r)";
 	pidl "{";
 	indent;
 
@@ -2383,11 +2380,6 @@
 		pidl choose_header("librpc/gen_ndr/ndr_dcerpc.h", "gen_ndr/ndr_dcerpc.h");
 		pidl choose_header("librpc/rpc/dcerpc.h", "dcerpc.h"); #FIXME: This shouldn't be here!
 	}
-
-	pidl "/* define dummy __attribute__ for systems that don't have it */";
-	pidl "#if !(defined(__GNUC__) || defined(__GNUG__) || defined(__attribute__))";
-	pidl "#define __attribute__(p) /* nothing */";
-	pidl "#endif";
 }
 
 #####################################################################