summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher R. Hertel <crh@samba.org>1998-05-22 05:16:27 +0000
committerChristopher R. Hertel <crh@samba.org>1998-05-22 05:16:27 +0000
commit6580fa6b5ce023a6bb7ce8aa9b8ab4b5c524f08b (patch)
tree991666beff6e4384337c15198328dd257eb93732
parentb26d9b8869eb2fcd71c64206d6659ea70468af9f (diff)
downloadsamba-6580fa6b5ce023a6bb7ce8aa9b8ab4b5c524f08b.tar.gz
samba-6580fa6b5ce023a6bb7ce8aa9b8ab4b5c524f08b.tar.bz2
samba-6580fa6b5ce023a6bb7ce8aa9b8ab4b5c524f08b.zip
Removed all ubiqx includes from includes.h. So far, this was only a problem
for dir.h, which I've fixed. Andrew did not add includes.h to the ubiqx headers, which is good because it would cause internal conflicts within the ubiqx tree modules. It's also bad because the definitions and includes that are part of includes.h are now in the ubiqx C files, but not in the header files. So, if includes.h were to redefine int, for example, the new definition would be in the ubiqx C files, but not in the headers. So, until Andrew and I can work something out that we both agree upon, there are three basic rules: 1) Don't include includes.h in the ubiqx headers. Problems may arise. 2) The ubiqx headers must follow includes.h in any Samba module that uses them. This can and should all be worked out. We just have to talk about it. Chris -)----- (This used to be commit 2b6be7084df4ddfca3a1ab7b73304007c5f9d0aa)
-rw-r--r--source3/include/includes.h1
-rw-r--r--source3/smbd/dir.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 49fb30e786..eda5afbe4e 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1218,7 +1218,6 @@ extern char *sys_errlist[];
#include "version.h"
#include "smb.h"
#include "nameserv.h"
-#include "ubiqx/ubi_dLinkList.h"
#include "byteorder.h"
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 37fcd05743..59ee23bbe8 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "ubiqx/ubi_dLinkList.h"
extern int DEBUGLEVEL;
extern connection_struct Connections[];