[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-409-g389e2fb

Jeremy Allison jra at samba.org
Thu Sep 17 12:11:55 MDT 2009


The branch, master has been updated
       via  389e2fb812097073d710cd7bf19396112936b404 (commit)
       via  95311a220e7107ec8b3012d67d5efef57313a274 (commit)
      from  f8dae40fc8e40f747a4571a2500bba9f1a790fa5 (commit)

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


- Log -----------------------------------------------------------------
commit 389e2fb812097073d710cd7bf19396112936b404
Merge: 95311a220e7107ec8b3012d67d5efef57313a274 f8dae40fc8e40f747a4571a2500bba9f1a790fa5
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Sep 17 11:11:23 2009 -0700

    Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

commit 95311a220e7107ec8b3012d67d5efef57313a274
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Sep 17 11:08:42 2009 -0700

    Fix the problem with pidl generating invalid C for enums. According
    to the C standard an enum is guarenteed to be an (int), which means
    for 4 byte ints specifying a type of 0x80000000 is an invalid value.
    The Solaris compiler complains about this. Fix by adding an (int)
    cast in front of the value generation.
    Jeremy.

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

Summary of changes:
 pidl/lib/Parse/Pidl/Samba4/Header.pm |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/lib/Parse/Pidl/Samba4/Header.pm b/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 5315957..bb497bb 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Header.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Header.pm
@@ -120,10 +120,18 @@ sub HeaderEnum($$;$)
 		pidl " {\n";
 		$tab_depth++;
 		foreach my $e (@{$enum->{ELEMENTS}}) {
+			my @enum_els = ();
 			unless ($first) { pidl ",\n"; }
 			$first = 0;
 			pidl tabs();
-			pidl $e;
+			@enum_els = split(/=/, $e);
+			if (@enum_els == 2) {
+				pidl $enum_els[0];
+				pidl "=(int)";
+				pidl $enum_els[1];
+			} else {
+				pidl $e;
+			}
 		}
 		pidl "\n";
 		$tab_depth--;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list