shuffle caddr_t to its only user, and use (void *) on Linux instead,

to appease Fefe’s dietlibc [-Wdeprecated-declarations]
This commit is contained in:
tg
2011-12-10 14:12:17 +00:00
parent 3b87d173d4
commit 44c408f9ac
2 changed files with 24 additions and 24 deletions

11
sh.h
View File

@@ -151,7 +151,7 @@
#endif
#ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.510 2011/12/10 13:34:18 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.511 2011/12/10 14:12:17 tg Exp $");
#endif
#define MKSH_VERSION "R40 2011/12/10"
@@ -283,15 +283,6 @@ typedef u_int8_t uint8_t;
#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
#endif
#if !defined(MAP_FAILED)
/* XXX imake style */
# if defined(__linux)
#define MAP_FAILED ((void *)-1)
# elif defined(__bsdi__) || defined(__osf__) || defined(__ultrix)
#define MAP_FAILED ((caddr_t)-1)
# endif
#endif
#ifndef NSIG
#if defined(_NSIG)
#define NSIG _NSIG