r18099: 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
(This used to be commit 027c7964eeb658d47e4aa2b974cc0c6089dbdba0)

1 files changed, 7 insertions, 11 deletions

diff --git a/source3/lib/talloctort.c b/source3/lib/talloctort.c
index ae533399bc..766cf039c0 100644
--- a/source3/lib/talloctort.c
+++ b/source3/lib/talloctort.c
@@ -609,23 +609,19 @@ static BOOL test_realloc(void)
 	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");