svn commit: samba r18030 - in branches/SAMBA_3_0/source/tdb/common:
.
vlendec at samba.org
vlendec at samba.org
Mon Sep 4 10:12:04 GMT 2006
Author: vlendec
Date: 2006-09-04 10:12:04 +0000 (Mon, 04 Sep 2006)
New Revision: 18030
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18030
Log:
When compiling with C++, nested structs lead to nested class definitions which
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
Modified:
branches/SAMBA_3_0/source/tdb/common/transaction.c
Changeset:
Modified: branches/SAMBA_3_0/source/tdb/common/transaction.c
===================================================================
--- branches/SAMBA_3_0/source/tdb/common/transaction.c 2006-09-04 09:51:47 UTC (rev 18029)
+++ branches/SAMBA_3_0/source/tdb/common/transaction.c 2006-09-04 10:12:04 UTC (rev 18030)
@@ -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 @@
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
More information about the samba-cvs
mailing list