gwj / at91sam9263 · Commits

Commit ee2654ac243748284eadd63523c65cae5bfdcf90

Authored by bellard
1 parent 354ff226

removed unused includes - BSD port 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1014 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 5 additions and 20 deletions
slirp/slirp.h
  View file @ee2654a
@@ -121,25 +121,10 @@ int inet_aton _P((const char *cp, struct in_addr *ia)); @@ -121,25 +121,10 @@ int inet_aton _P((const char *cp, struct in_addr *ia));
121 #endif 121 #endif
122 #include <sys/socket.h> 122 #include <sys/socket.h>
123 123
124 -#if defined(WANT_SYS_IOCTL_H) && defined(HAVE_SYS_IOCTL_H) 124 +#if defined(HAVE_SYS_IOCTL_H)
125 # include <sys/ioctl.h> 125 # include <sys/ioctl.h>
126 -#else  
127 -# define WANT_SYS_TERMIOS_H  
128 -#endif  
129 -  
130 -#ifdef WANT_SYS_TERMIOS_H  
131 -# ifndef INCLUDED_TERMIOS_H  
132 -# ifdef HAVE_TERMIOS_H  
133 -# include <termios.h>  
134 -# else  
135 -# include <termio.h>  
136 -# endif  
137 -# define INCLUDED_TERMIOS_H  
138 -# endif  
139 #endif 126 #endif
140 127
141 -  
142 -  
143 #ifdef HAVE_SYS_SELECT_H 128 #ifdef HAVE_SYS_SELECT_H
144 # include <sys/select.h> 129 # include <sys/select.h>
145 #endif 130 #endif
slirp/slirp_config.h
  View file @ee2654a
@@ -61,10 +61,13 @@ @@ -61,10 +61,13 @@
61 #define HAVE_STDLIB_H 61 #define HAVE_STDLIB_H
62 62
63 /* Define if you have sys/ioctl.h */ 63 /* Define if you have sys/ioctl.h */
64 -#undef HAVE_SYS_IOCTL_H 64 +#define HAVE_SYS_IOCTL_H
65 65
66 /* Define if you have sys/filio.h */ 66 /* Define if you have sys/filio.h */
67 #undef HAVE_SYS_FILIO_H 67 #undef HAVE_SYS_FILIO_H
  68 +#ifdef __APPLE__
  69 +#define HAVE_SYS_FILIO_H
  70 +#endif
68 71
69 /* Define if you have strerror */ 72 /* Define if you have strerror */
70 #define HAVE_STRERROR 73 #define HAVE_STRERROR
@@ -161,9 +164,6 @@ @@ -161,9 +164,6 @@
161 /* Define if you have memmove */ 164 /* Define if you have memmove */
162 #define HAVE_MEMMOVE 165 #define HAVE_MEMMOVE
163 166
164 -/* Define if you have <termios.h> */  
165 -#undef HAVE_TERMIOS_H  
166 -  
167 /* Define if you have gethostid */ 167 /* Define if you have gethostid */
168 #undef HAVE_GETHOSTID 168 #undef HAVE_GETHOSTID
169 169