Removed spurious #ifdef's for files that are in gnulib.

This commit is contained in:
Alfred M. Szmidt
2010-05-14 21:27:32 +02:00
parent 34f91cc1f7
commit 078a0bc410
9 changed files with 20 additions and 53 deletions

View File

@@ -1,3 +1,11 @@
2010-05-14 Alfred M. Szmidt <ams@gnu.org>
* talk/msgs.c: Include <sys/time.h>, <time.h> unconditionally.
* talk/io.c: Include <sys/time.h>, <time.h>, <sys/select.h> unconditionally.
* talk/invite.c: Include <sys/time.h>, <time.h> unconditionally.
* talk/ctl_transact.c: Include <sys/time.h>, <time.h>,
<sys/select.h> unconditionally.
2010-05-14 Alfred M. Szmidt <ams@gnu.org>
* Makefile.am (DISTCLEANFILES): Added `$(PACKAGE)-$(VERSION).tar.gz' to list.
@@ -8,8 +16,8 @@
* configure.ac: Use || and && type of test instead of -o and -a
for calls to `test'. Don't check for poll() Include <errno.h>
unconditionallyincheck for `sys_errlist'. Include <unistd.h> and
<stdlib.h> in check for `environ'.
unconditionally in check for `sys_errlist'. Include <unistd.h>
and <stdlib.h> in check for `environ'.
* am/config_paths.m4: Use || and && type of test instead of -o and
-a for calls to `test'.
* am/libcurses.m4: Likewise.

View File

@@ -127,4 +127,3 @@ open_ctl ()
return 0;
}

View File

@@ -53,20 +53,10 @@
#include <sys/types.h>
#include <sys/socket.h>
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#include <sys/time.h>
#include <time.h>
#include <netinet/in.h>
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
#endif
#include <sys/select.h>
#ifdef HAVE_OSOCKADDR_H
# include <osockaddr.h>
#endif

View File

@@ -222,4 +222,3 @@ display (register xwin_t * win, register char *text, int size)
return 0;
}

View File

@@ -55,16 +55,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#include <sys/time.h>
#include <time.h>
#include <signal.h>
#include <netinet/in.h>
#ifdef HAVE_OSOCKADDR_H

View File

@@ -62,23 +62,13 @@
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#include <sys/time.h>
#include <time.h>
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
#endif
#include <sys/select.h>
#include "talk.h"
#define A_LONG_TIME 10000000

View File

@@ -137,4 +137,3 @@ check_local ()
return -1;
}

View File

@@ -56,16 +56,8 @@
# include <config.h>
#endif
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#include <sys/time.h>
#include <time.h>
#include <signal.h>
#include <stdio.h>
#include "talk.h"

View File

@@ -105,5 +105,3 @@ int open_ctl (void);
/* look_up.c */
int check_local (void);