Commit cebee21a authored by Thomas Huth's avatar Thomas Huth Committed by Samuel Thibault
Browse files

slirp: Clean up slirp_config.h 



There are a lot of unused #defines / #undefs in slirp_config.h,
which are apparently left-overs from the very early slirp code.
Since there is no more code that uses them, let's simply remove
them from our version of slirp.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
parent 70f87e0f

slirp/slirp_config.h

+0 −87
Original line number Diff line number Diff line
@@ -9,19 +9,6 @@ 
/* Define to 1 if you want KEEPALIVE timers */

#define DO_KEEPALIVE 0



/* Define to MAX interfaces you expect to use at once */

/* MAX_INTERFACES determines the max. TOTAL number of interfaces (SLIP and PPP) */

/* MAX_PPP_INTERFACES determines max. number of PPP interfaces */

#define MAX_INTERFACES 1

#define MAX_PPP_INTERFACES 1



/* Define if you want slirp's socket in /tmp */

/* XXXXXX Do this in ./configure */

#undef USE_TMPSOCKET



/* Define if you want slirp to use cfsetXspeed() on the terminal */

#undef DO_CFSETSPEED



/* Define this if you want slirp to write to the tty as fast as it can */

/* This should only be set if you are using load-balancing, slirp does a */

/* pretty good job on single modems already, and seting this will make */
@@ -29,34 +16,12 @@ 
/* XXXXX Talk about having fast modem as unit 0 */

#undef FULL_BOLT



/*

 * Define if you want slirp to use less CPU

 * You will notice a small lag in interactive sessions, but it's not that bad

 * Things like Netscape/ftp/etc. are completely unaffected

 * This is mainly for sysadmins who have many slirp users

 */

#undef USE_LOWCPU



/* Define this if your compiler doesn't like prototypes */

#ifndef __STDC__

#define NO_PROTOTYPES

#endif



/*********************************************************/

/*

 * Autoconf defined configuration options

 * You shouldn't need to touch any of these

 */



/* Ignore this */

#undef DUMMY_PPP



/* Define if you have unistd.h */

#define HAVE_UNISTD_H



/* Define if you have stdlib.h */

#define HAVE_STDLIB_H



/* Define if you have sys/ioctl.h */

#undef HAVE_SYS_IOCTL_H

#ifndef _WIN32
@@ -72,10 +37,6 @@ 
/* Define if you have strerror */

#define HAVE_STRERROR



/* Define according to how time.h should be included */

#define TIME_WITH_SYS_TIME 0

#undef HAVE_SYS_TIME_H



/* Define if you have sys/bitypes.h */

#undef HAVE_SYS_BITYPES_H
@@ -100,9 +61,6 @@ 
#define HAVE_SYS_SELECT_H

#endif



/* Define if you have strings.h */

#define HAVE_STRING_H



/* Define if you have arpa/inet.h */

#undef HAVE_ARPA_INET_H

#ifndef _WIN32
@@ -115,51 +73,18 @@ 
/* Define if you have sys/stropts.h */

#undef HAVE_SYS_STROPTS_H



/* Define to whatever your compiler thinks inline should be */

//#define inline inline



/* Define to whatever your compiler thinks const should be */

//#define const const



/* Define if your compiler doesn't like prototypes */

#undef NO_PROTOTYPES



/* Define to sizeof(char) */

#define SIZEOF_CHAR 1



/* Define to sizeof(short) */

#define SIZEOF_SHORT 2



/* Define to sizeof(int) */

#define SIZEOF_INT 4



/* Define to sizeof(char *) */

#define SIZEOF_CHAR_P (HOST_LONG_BITS / 8)



/* Define if you have random() */

#undef HAVE_RANDOM



/* Define if you have srandom() */

#undef HAVE_SRANDOM



/* Define if you have inet_aton */

#undef HAVE_INET_ATON

#ifndef _WIN32

#define HAVE_INET_ATON

#endif



/* Define if you have setenv */

#undef HAVE_SETENV



/* Define if you have index() */

#define HAVE_INDEX



/* Define if you have bcmp() */

#undef HAVE_BCMP



/* Define if you have drand48 */

#undef HAVE_DRAND48



/* Define if you have memmove */

#define HAVE_MEMMOVE
@@ -171,15 +96,3 @@ 
#ifdef _WIN32

#define NO_UNIX_SOCKETS

#endif
 


/* Define if you have revoke() */

#undef HAVE_REVOKE



/* Define if you have the sysv method of opening pty's (/dev/ptmx, etc.) */

#undef HAVE_GRANTPT



/* Define if you have fchmod */

#undef HAVE_FCHMOD



/* Define if you have <sys/type32.h> */

#undef HAVE_SYS_TYPES32_H