diff --git a/slirp/misc.c b/slirp/misc.c index 2fbd04856a..1a0ea1be4e 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -60,27 +60,6 @@ int add_exec(struct ex_list **ex_ptr, int do_pty, char *exec, return 0; } -#ifndef HAVE_STRERROR - -/* - * For systems with no strerror - */ - -extern int sys_nerr; -extern char *sys_errlist[]; - -char * -strerror(error) - int error; -{ - if (error < sys_nerr) - return sys_errlist[error]; - else - return "Unknown error."; -} - -#endif - #ifdef _WIN32 diff --git a/slirp/slirp.h b/slirp/slirp.h index 203deec480..5b5df59762 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -23,11 +23,6 @@ typedef char *caddr_t; # include #endif - -#ifndef HAVE_MEMMOVE -#define memmove(x, y, z) bcopy(y, x, z) -#endif - #ifndef _WIN32 #include #endif @@ -37,17 +32,6 @@ typedef char *caddr_t; #include #endif -/* Systems lacking strdup() definition in . */ -#if defined(ultrix) -char *strdup(const char *); -#endif - -/* Systems lacking malloc() definition in . */ -#if defined(ultrix) || defined(hcx) -void *malloc(size_t arg); -void free(void *ptr); -#endif - #ifndef NO_UNIX_SOCKETS #include #endif @@ -259,18 +243,6 @@ void if_start(Slirp *); void if_start(struct ttys *); #endif -#ifndef HAVE_STRERROR - char *strerror(int error); -#endif - -#ifndef HAVE_INDEX - char *index(const char *, int); -#endif - -#ifndef HAVE_GETHOSTID - long gethostid(void); -#endif - #ifndef _WIN32 #include #endif diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h index a5fa36e16f..c59f655207 100644 --- a/slirp/slirp_config.h +++ b/slirp/slirp_config.h @@ -34,9 +34,6 @@ #define HAVE_SYS_FILIO_H #endif -/* Define if you have strerror */ -#define HAVE_STRERROR - /* Define if you have sys/bitypes.h */ #undef HAVE_SYS_BITYPES_H @@ -82,15 +79,6 @@ #define HAVE_INET_ATON #endif -/* Define if you have index() */ -#define HAVE_INDEX - -/* Define if you have memmove */ -#define HAVE_MEMMOVE - -/* Define if you have gethostid */ -#define HAVE_GETHOSTID - /* Define if you DON'T have unix-domain sockets */ #undef NO_UNIX_SOCKETS #ifdef _WIN32