generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ifdef for includes, added checking for two not previously checked files (one

Browse Source 
being necessary for solaris builds)
This commit is contained in:
Daniel Stenberg
2005-09-15 21:50:50 +00:00
parent 29e36afb6b
commit 528a149def
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -1434,6 +1434,8 @@ AC_CHECK_HEADERS(
libgen.h \ libgen.h \
locale.h \ locale.h \
errno.h \ errno.h \
arpa/tftp.h \
sys/filio.h \
setjmp.h, setjmp.h,
dnl to do if not found dnl to do if not found
[], [],

29
tests/server/tftpd.c
View File

@@ -49,16 +49,37 @@
*/ */
#include "setup.h" /* portability help from the lib directory */ #include "setup.h" /* portability help from the lib directory */
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h> #include <sys/stat.h>
#include <signal.h> #endif
#include <fcntl.h>
#include <signal.h>
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_TFTP_H
#include <arpa/tftp.h> #include <arpa/tftp.h>
#endif
#ifdef HAVE_NETDB_H
#include <netdb.h> #include <netdb.h>
#endif
#ifdef HAVE_SYS_FILIO_H
/* FIONREAD on Solaris 7 */
#include <sys/filio.h>
#endif
#include <setjmp.h> #include <setjmp.h>
#include <stdio.h> #include <stdio.h>
@@ -683,7 +704,7 @@ static void sendfile(struct testcase *test, struct formats *pf)
{ {
struct tftphdr *dp; struct tftphdr *dp;
struct tftphdr *ap; /* ack packet */ struct tftphdr *ap; /* ack packet */
u_int16_t block = 1; unsigned short block = 1;
int size, n; int size, n;
mysignal(SIGALRM, timer); mysignal(SIGALRM, timer);
@@ -752,7 +773,7 @@ static void recvfile(struct testcase *test, struct formats *pf)
{ {
struct tftphdr *dp; struct tftphdr *dp;
struct tftphdr *ap; /* ack buffer */ struct tftphdr *ap; /* ack buffer */
u_int16_t block = 0; unsigned short block = 0;
int n, size; int n, size;
mysignal(SIGALRM, timer); mysignal(SIGALRM, timer);