diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 21:47:45 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 21:47:45 +0100 |
commit | 5076c64d43c68a028ac944c336715b4cb277365f (patch) | |
tree | e88fc16979b75b5b30377e84b76ebb1b87e01591 /lib/util | |
parent | 6998ef4fe021ebf40f63c2191d3259888a8ad7f4 (diff) | |
parent | 13eefa7c435cb5ac656f662c78260a82caf43180 (diff) | |
download | samba-5076c64d43c68a028ac944c336715b4cb277365f.tar.gz samba-5076c64d43c68a028ac944c336715b4cb277365f.tar.bz2 samba-5076c64d43c68a028ac944c336715b4cb277365f.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
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; |