diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-07-24 13:25:06 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-07-24 13:25:06 +0000 |
commit | ce75da600a2c46755679561e3b4d025048addd16 (patch) | |
tree | 13b594c3fbabdf159690270b51671374ec7da3b1 | |
parent | 2002-07-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-ce75da600a2c46755679561e3b4d025048addd16.tar.bz2 |
2002-07-24 Joel Sherrill <joel@OARcorp.com>
* Makefile.am, libc/res_send.c: Do not install or use <poll.h>
since RTEMS does not support it.
-rw-r--r-- | cpukit/libnetworking/ChangeLog | 4 | ||||
-rw-r--r-- | cpukit/libnetworking/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libnetworking/libc/res_send.c | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index f87e19bf8e..a9f12b4103 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,7 @@ +2002-07-24 Joel Sherrill <joel@OARcorp.com> + + * Makefile.am, libc/res_send.c: Do not install or use <poll.h> + since RTEMS does not support it. 2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * kern/Makefile.am: Use .$(OBJEXT) instead of .o. diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index a2dca14fc8..2a470b5212 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -7,9 +7,11 @@ ACLOCAL_AMFLAGS = -I ../aclocal SUBDIRS = arpa kern machine sys vm lib libc net netinet nfs rtems SUBDIRS += wrapup +## poll.h is not in the list because RTEMS does not have poll() +## and installing poll.h confuses autoconf. include_HEADERS = \ bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \ - opt_tcpdebug.h poll.h resolv.h syslog.h memory.h + opt_tcpdebug.h resolv.h syslog.h memory.h PREINSTALL_FILES = $(PROJECT_INCLUDE) \ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) diff --git a/cpukit/libnetworking/libc/res_send.c b/cpukit/libnetworking/libc/res_send.c index 08cb78490f..fadc16c566 100644 --- a/cpukit/libnetworking/libc/res_send.c +++ b/cpukit/libnetworking/libc/res_send.c @@ -95,11 +95,14 @@ static char rcsid[] = "$Id$"; #include <stdlib.h> #include <string.h> #include <unistd.h> +#if !defined(__rtems__) #include <poll.h> +#endif #include "res_config.h" #if !defined(__rtems__) + #ifdef NOPOLL /* libc_r doesn't wrap poll yet() */ static int use_poll = 0; #else |