aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2016-05-13 09:04:30 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-05-16 20:58:47 +0200
commit5469feadb1dafc663ed5b978dc9a5ff0b1b69a6e (patch)
tree874a1770a2d766265758d6dea3a59d54a1cef9ca
parentcebee21aca9ffef0248b6b6e37c4c152358241a3 (diff)
downloadqemu-arm-5469feadb1dafc663ed5b978dc9a5ff0b1b69a6e.tar.gz
slirp: Remove obsolete backward-compatibility cruft
The slirp code does not use index() and gethostid() anymore, so these parts can be removed without problems. memmove() and strerror() should be available on each of the supported platforms nowadays, too, so these wrappers are also not needed anymore. And we certainly also do not support Ultrix anymore, so no need to keep the code for this platform anymore. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
-rw-r--r--slirp/misc.c21
-rw-r--r--slirp/slirp.h28
-rw-r--r--slirp/slirp_config.h12
3 files changed, 0 insertions, 61 deletions
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 <sys/bitypes.h>
#endif
-
-#ifndef HAVE_MEMMOVE
-#define memmove(x, y, z) bcopy(y, x, z)
-#endif
-
#ifndef _WIN32
#include <sys/uio.h>
#endif
@@ -37,17 +32,6 @@ typedef char *caddr_t;
#include <arpa/inet.h>
#endif
-/* Systems lacking strdup() definition in <string.h>. */
-#if defined(ultrix)
-char *strdup(const char *);
-#endif
-
-/* Systems lacking malloc() definition in <stdlib.h>. */
-#if defined(ultrix) || defined(hcx)
-void *malloc(size_t arg);
-void free(void *ptr);
-#endif
-
#ifndef NO_UNIX_SOCKETS
#include <sys/un.h>
#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 <netdb.h>
#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