diff options
| author | dgp <dgp@users.sourceforge.net> | 2021-01-08 21:07:57 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2021-01-08 21:07:57 (GMT) |
| commit | 8229cd730444707ecef238b9678a5c8d779554f0 (patch) | |
| tree | 28dbb787f28e59d75da785125db09451de89b1ff /unix/tclUnixPort.h | |
| parent | db51032d33e94c96859a874ec838558620720a09 (diff) | |
| parent | 4e3cd053dbb7487dfdf2e93f5151d9bdd5f9865e (diff) | |
| download | tcl-8229cd730444707ecef238b9678a5c8d779554f0.zip tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.gz tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.bz2 | |
Merge 8.7 (resolve conflicts)
Diffstat (limited to 'unix/tclUnixPort.h')
| -rw-r--r-- | unix/tclUnixPort.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 77426c8..cefe603 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -139,16 +139,10 @@ extern "C" { # include <sys/select.h> #endif #include <sys/stat.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 <time.h> #ifndef NO_SYS_WAIT_H # include <sys/wait.h> #endif |