summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-12 16:19:15 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-12 16:19:15 +0200
commit1d0cda2f034c44e2274f90b5453e5b031446c034 (patch)
treeca54508480926355a3151964d563a0ba0d7656ab /source3/include
parenta59ce1d94c5b3e3e57c40ee0a60c1c3df3304bfa (diff)
downloadsamba-1d0cda2f034c44e2274f90b5453e5b031446c034.tar.gz
samba-1d0cda2f034c44e2274f90b5453e5b031446c034.tar.bz2
samba-1d0cda2f034c44e2274f90b5453e5b031446c034.zip
Use common xfile.h.
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/include/xfile.h48
2 files changed, 1 insertions, 49 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 27cd3dbb1c..40caf22fba 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -646,7 +646,7 @@ typedef char fstring[FSTRING_LEN];
#endif
/* Lists, trees, caching, database... */
-#include "xfile.h"
+#include "../lib/util/xfile.h"
#include "intl.h"
#include "../lib/util/dlinklist.h"
#include "tdb.h"
diff --git a/source3/include/xfile.h b/source3/include/xfile.h
deleted file mode 100644
index ffe4481a64..0000000000
--- a/source3/include/xfile.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- stdio replacement
- Copyright (C) Andrew Tridgell 2001
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _XFILE_H_
-#define _XFILE_H_
-/*
- see xfile.c for explanations
-*/
-
-typedef struct {
- int fd;
- char *buf;
- char *next;
- int bufsize;
- int bufused;
- int open_flags;
- int buftype;
- int flags;
-} XFILE;
-
-extern XFILE *x_stdin, *x_stdout, *x_stderr;
-
-/* buffering type */
-#define X_IOFBF 0
-#define X_IOLBF 1
-#define X_IONBF 2
-
-#define x_getc(f) x_fgetc(f)
-
-int x_vfprintf(XFILE *f, const char *format, va_list ap) PRINTF_ATTRIBUTE(2, 0);
-int x_fprintf(XFILE *f, const char *format, ...) PRINTF_ATTRIBUTE(2, 3);
-#endif /* _XFILE_H_ */