r18030: When compiling with C++, nested structs lead to nested class definitions...

are not compatible. I am aware that this would be a huge change in Samba4, but
I would like to see it in the code that is shared.

Stefan, when you do merge work, can you get this across to Samba4?

Thanks,

Volker
(This used to be commit 959ea2c7dc3ab42a06ac74dc4767d7d06e525cbc)

diff --git a/source3/tdb/common/transaction.c b/source3/tdb/common/transaction.c
index b71728db5ce4862cecd54abfeb3b6a19be36f4f7..8e21e3ad87fcdc5c0c6c7b014cf3949bc425a838 100644 (file)
--- a/source3/tdb/common/transaction.c
+++ b/source3/tdb/common/transaction.c
@@ -88,6 +88,12 @@
 
 */
 
+struct tdb_transaction_el {
+       struct tdb_transaction_el *next, *prev;
+       tdb_off_t offset;
+       tdb_len_t length;
+       unsigned char *data;
+};
 
 /*
   hold the context of any current transaction
@@ -105,12 +111,7 @@ struct tdb_transaction {
           ordered, with first element at the front of the list. It
           needs to be doubly linked as the read/write traversals need
           to be backwards, while the commit needs to be forwards */
-       struct tdb_transaction_el {
-               struct tdb_transaction_el *next, *prev;
-               tdb_off_t offset;
-               tdb_len_t length;
-               unsigned char *data;
-       } *elements, *elements_last;
+       struct tdb_transaction_el *elements, *elements_last;
 
        /* non-zero when an internal transaction error has
           occurred. All write operations will then fail until the