mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
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 commit is contained in:
parent
f8d6aab70a
commit
2b6be7084d
@ -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"
|
||||
|
||||
|
@ -20,6 +20,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
#include "ubiqx/ubi_dLinkList.h"
|
||||
|
||||
extern int DEBUGLEVEL;
|
||||
extern connection_struct Connections[];
|
||||
|
Loading…
Reference in New Issue
Block a user