From b80b6ea3b43a880bb392b8ef8caaff0f11bb80ef Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 18 Dec 1997 11:05:00 +0000 Subject: kanji.h: Fixed problems with re-definitions of strchr and others on AIX. nmbd_nameregister.c: Applied fix found by "Eloy A. Paris" (don't re-use lists after you have freed them :-). Jeremy. (This used to be commit bcfcc39a2752de0fb35b419d005bb1a86fd15fea) --- source3/include/kanji.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'source3/include/kanji.h') diff --git a/source3/include/kanji.h b/source3/include/kanji.h index 528680d88a..5e8173ee14 100644 --- a/source3/include/kanji.h +++ b/source3/include/kanji.h @@ -108,6 +108,30 @@ extern char *(*_dos_to_unix)(char *str, BOOL overwrite); extern char *(*_unix_to_dos)(char *str, BOOL overwrite); +/* + * The following is needed for AIX systems that have + * their own #defines for strchr, strrchr, strstr + * and strtok. + */ + +#ifdef strchr +#undef strchr +#endif /* strchr */ + +#ifdef strrchr +#undef strrchr +#endif /* strrchr */ + +#ifdef strstr +#undef strstr +#endif /* strstr */ + +#ifdef strtok +#undef strtok +#endif /* strtok */ + +/* Ensure we use our definitions. */ + #define strchr sj_strchr #define strrchr sj_strrchr #define strstr sj_strstr -- cgit