diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 22:31:10 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 22:31:10 +0100 |
| commit | 9940c7690e2c1b225111d5d8e09cc735ebe296dd (patch) | |
| tree | 69741878e2c36fbff1e34c8f1d8c3ccba1fbcc27 /source3 | |
| parent | 9551ab8f7b0e69349dc0c1ffb70a6f67163b242c (diff) | |
| download | samba-9940c7690e2c1b225111d5d8e09cc735ebe296dd.tar.gz samba-9940c7690e2c1b225111d5d8e09cc735ebe296dd.tar.xz samba-9940c7690e2c1b225111d5d8e09cc735ebe296dd.zip | |
Use shared header file for character sets, remove old definitions from samba3 smb.h.
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/includes.h | 2 | ||||
| -rw-r--r-- | source3/include/smb.h | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 63c77ec1822..ca918b37df7 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -594,7 +594,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "trans2.h" #include "../libcli/util/error.h" #include "ntioctl.h" -#include "charset.h" +#include "../lib/util/charset/charset.h" #include "dynconfig.h" #include "util_getent.h" #include "debugparse.h" diff --git a/source3/include/smb.h b/source3/include/smb.h index 5c2bd12df0c..59c3c32346d 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -165,10 +165,6 @@ typedef union unid_t { #define COPY_UCS2_CHAR(dest,src) (((unsigned char *)(dest))[0] = ((unsigned char *)(src))[0],\ ((unsigned char *)(dest))[1] = ((unsigned char *)(src))[1], (dest)) -/* Large data type for manipulating uint32 unicode codepoints */ -typedef uint32 codepoint_t; -#define INVALID_CODEPOINT ((codepoint_t)-1) - /* pipe string names */ #define PIPE_LANMAN "\\PIPE\\LANMAN" @@ -1829,18 +1825,6 @@ struct unix_error_map { #define SAFE_NETBIOS_CHARS ". -_" -/* generic iconv conversion structure */ -typedef struct _smb_iconv_t { - size_t (*direct)(void *cd, const char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft); - size_t (*pull)(void *cd, const char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft); - size_t (*push)(void *cd, const char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft); - void *cd_direct, *cd_pull, *cd_push; - char *from_name, *to_name; -} *smb_iconv_t; - /* The maximum length of a trust account password. Used when we randomly create it, 15 char passwords exceed NT4's max password length */ |