summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-05 15:28:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:43:28 -0500
commit458a3ff20c72d8634ee8f8af4bf1d6daabb7c788 (patch)
tree730010d96d88e32e7c43e6f4b8a86d721652a27e /source3
parenteb536690e2a594c5570354897bd05adc6ac95436 (diff)
downloadsamba-458a3ff20c72d8634ee8f8af4bf1d6daabb7c788.tar.gz
samba-458a3ff20c72d8634ee8f8af4bf1d6daabb7c788.tar.bz2
samba-458a3ff20c72d8634ee8f8af4bf1d6daabb7c788.zip
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)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/talloctort.c18
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");