diff options
| author | Jeremy Allison <jra@samba.org> | 1997-12-18 11:05:00 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-12-18 11:05:00 +0000 |
| commit | b80b6ea3b43a880bb392b8ef8caaff0f11bb80ef (patch) | |
| tree | 380bd80321e53b2823df2f5d557d4ad9c3d57dc8 /source3/include | |
| parent | efa661cb17d0a474403fc3589f716dc7d98502ff (diff) | |
| download | samba-b80b6ea3b43a880bb392b8ef8caaff0f11bb80ef.tar.gz samba-b80b6ea3b43a880bb392b8ef8caaff0f11bb80ef.tar.bz2 samba-b80b6ea3b43a880bb392b8ef8caaff0f11bb80ef.zip | |
kanji.h: Fixed problems with re-definitions of strchr and others on AIX.
nmbd_nameregister.c: Applied fix found by "Eloy A. Paris" <eparis@ven.ra.rockwell.com>
(don't re-use lists after you have freed them :-).
Jeremy.
(This used to be commit bcfcc39a2752de0fb35b419d005bb1a86fd15fea)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/kanji.h | 24 |
1 files changed, 24 insertions, 0 deletions
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 |