diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-18 14:54:57 +0000 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-18 14:54:57 +0000 |
commit | d14c8604653d39dd25736279d34930ee7a3ae103 (patch) | |
tree | 626f700b9b42b798ed7459a5cba5cd27aca9753e /lib/util | |
parent | 0c0b9c738f0fc1bf8aa64533a5e4e0635b84f58f (diff) | |
parent | fc31f2c5269fd405be96b9a036baf35a60141ccf (diff) | |
download | samba-d14c8604653d39dd25736279d34930ee7a3ae103.tar.gz samba-d14c8604653d39dd25736279d34930ee7a3ae103.tar.bz2 samba-d14c8604653d39dd25736279d34930ee7a3ae103.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into pyregistry
Diffstat (limited to 'lib/util')
-rw-r--r-- | lib/util/debug.h | 3 | ||||
-rw-r--r-- | lib/util/xfile.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/util/debug.h b/lib/util/debug.h index a5962b04bb..7518a64e19 100644 --- a/lib/util/debug.h +++ b/lib/util/debug.h @@ -133,6 +133,7 @@ _PUBLIC_ void register_debug_handlers(const char *name, struct debug_ops *ops); */ _PUBLIC_ void dbgtext(const char *format, ...) PRINTF_ATTRIBUTE(1,2); -extern XFILE *dbf; +struct _XFILE; +extern struct _XFILE *dbf; #endif diff --git a/lib/util/xfile.h b/lib/util/xfile.h index af90f3f55c..1b15929997 100644 --- a/lib/util/xfile.h +++ b/lib/util/xfile.h @@ -23,7 +23,7 @@ see xfile.c for explanations */ -typedef struct { +typedef struct _XFILE { int fd; char *buf; char *next; |