Changeset 243

Show
Ignore:
Timestamp:
05/27/05 04:50:15 (3 years ago)
Author:
athomas
Message:

Extra check for sys/time.h time.h include conflict.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • op/branches/autoconf/configure.in

    r242 r243  
    3939AC_HEADER_STDC 
    4040AC_HEADER_SYS_WAIT 
     41AC_HEADER_TIME 
    4142AC_CHECK_HEADERS([limits.h netdb.h shadow.h stdlib.h string.h sys/time.h syslog.h unistd.h]) 
    4243 

  • op/branches/autoconf/defs.h

    r242 r243  
    1212#include <limits.h> 
    1313#include "config.h" 
     14 
     15#if TIME_WITH_SYS_TIME 
     16# include <sys/time.h> 
     17# include <time.h> 
     18#else 
     19# if HAVE_SYS_TIME_H 
     20#  include <sys/time.h> 
     21# else 
     22#  include <time.h> 
     23# endif 
     24#endif 
    1425 
    1526#if HAVE_DIRENT_H 

  • op/branches/autoconf/main.c

    r240 r243  
    1212#include <sys/stat.h> 
    1313#include <errno.h> 
    14 #include <sys/time.h> 
    1514#include <netdb.h> 
    16 #include <time.h> 
    1715#include <signal.h> 
    1816#include <stdio.h>