svn commit: samba r18099 - in branches/SAMBA_3_0/source/lib: .

[metze at samba.org]

Author: metze
Date: 2006-09-05 15:28:28 +0000 (Tue, 05 Sep 2006)
New Revision: 18099

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

Log:
merge from samba4 to make tcc happy as the same struct name was used in multiple
places and that only works if they're all in a local scope

metze
Modified:
   branches/SAMBA_3_0/source/lib/talloctort.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/talloctort.c
===================================================================
--- branches/SAMBA_3_0/source/lib/talloctort.c	2006-09-05 15:26:03 UTC (rev 18098)
+++ branches/SAMBA_3_0/source/lib/talloctort.c	2006-09-05 15:28:28 UTC (rev 18099)
@@ -609,23 +609,19 @@
 	return True;
 }
 
-struct el2 {
-	const char *name;
-};
-
-struct el1 {
-	int count;
-	struct el2 **list, **list2, **list3;
-};
-
 /*
   test realloc with a child
 */
 static BOOL test_realloc_child(void)
 {
 	void *root;
-	struct el1 *el1;
-	struct el2 *el2;
+	struct el2 {
+		const char *name;
+	} *el2;	
+	struct el1 {
+		int count;
+		struct el2 **list, **list2, **list3;
+	} *el1;
 
 	printf("TESTING REALLOC WITH CHILD\n");