diff options
| author | Christopher R. Hertel <crh@samba.org> | 1998-06-03 21:38:51 +0000 |
|---|---|---|
| committer | Christopher R. Hertel <crh@samba.org> | 1998-06-03 21:38:51 +0000 |
| commit | 52c69766ea495f08a907c6ca76b1cef8df8c5d7c (patch) | |
| tree | 995f70cd33cc73cacbea54125d48a6959df7607d /source3/include/includes.h | |
| parent | c435955b02c7fc227b9475ff73c62e080d34a1af (diff) | |
| download | samba-52c69766ea495f08a907c6ca76b1cef8df8c5d7c.tar.gz samba-52c69766ea495f08a907c6ca76b1cef8df8c5d7c.tar.bz2 samba-52c69766ea495f08a907c6ca76b1cef8df8c5d7c.zip | |
It occurred to me that the samba includes.h file should be included in the
header files used by the ubiqx modules, instead of being hidden in the .c
files. This would ensure that anything in includes.h would be "seen" by
the ubiqx headers. I also had to put an #ifdef around the includes for
ubi_SplayTree.h and ubi_Cache.h in includes.h to prevent the header of the
descendant type from being included before its parent type.
Chris -)-----
(This used to be commit e30a7e023b7491c01e052ae3dbd1788f84075413)
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 00f4e7ee0f..5054c2ee5b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1386,11 +1386,14 @@ extern int errno; /* -------------------------------------------------------------------------- ** - * Lists, trees, and caches... + * Lists, trees, and caching... */ #include "ubiqx/ubi_sLinkList.h" #include "ubiqx/ubi_dLinkList.h" + +#ifndef UBI_BINTREE_H #include "ubiqx/ubi_SplayTree.h" #include "ubiqx/ubi_Cache.h" +#endif /* UBI_BINTREE_H */ #endif /* _INCLUDES_H */ |