diff options
author | Jeremy Allison <jra@samba.org> | 1997-09-11 20:17:32 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 1997-09-11 20:17:32 +0000 |
commit | 30416c0b8a0f54f6cc1179c2e00860eaf5f58401 (patch) | |
tree | 09137fd9f782aaf0df42e59aff10953ed95bed32 /source3/lib/kanji.c | |
parent | 77df5c87c69ea7f929df211c41da522248d73cfc (diff) | |
download | samba-30416c0b8a0f54f6cc1179c2e00860eaf5f58401.tar.gz samba-30416c0b8a0f54f6cc1179c2e00860eaf5f58401.tar.bz2 samba-30416c0b8a0f54f6cc1179c2e00860eaf5f58401.zip |
charcnv.c client.c clitar.c kanji.c kanji.h loadparm.c
mangle.c smb.h util.c:
Big merge to allow KANJI support to be in the main
binary without explicitly compiling with it.
locking.c: Fix for smbstatus not being able to read files.
namepacket.c: Removed unneccesary debug statement.
trans2.c: Added Luke's proposed fix (ifdefed out until further testing).
nmblookup.c: Fixed bug where query fails and status is done on bogus IP.
Jeremy (jallison@whistle.com)
(This used to be commit 9196255022ae8c51b527412747b324819bea2c13)
Diffstat (limited to 'source3/lib/kanji.c')
-rw-r--r-- | source3/lib/kanji.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source3/lib/kanji.c b/source3/lib/kanji.c index 479763fd40..f5888e4877 100644 --- a/source3/lib/kanji.c +++ b/source3/lib/kanji.c @@ -23,7 +23,6 @@ and add all jis codes sequence type at 1995.8.16 Notes: Hexadecimal code by <ohki@gssm.otuka.tsukuba.ac.jp> */ -#ifdef KANJI #define _KANJI_C_ #include "includes.h" @@ -888,7 +887,3 @@ int interpret_coding_system(char *str, int def) } return setup_string_function (codes); } -#else - int kanji_dummy_procedure(void) -{return 0;} -#endif /* KANJI */ |