diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-06-02 11:08:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-06-02 11:08:57 (GMT) |
| commit | 43f72f639e769da85db050f2e571b556502f32ab (patch) | |
| tree | 183b8ac2ca67fab6772f6e9738009e6a65799d4d /unix | |
| parent | 242f56b0931124121db5ea095c3fdc57c7240059 (diff) | |
| parent | f5f03750c82c00fb96383a48414a553b53130d73 (diff) | |
| download | tcl-43f72f639e769da85db050f2e571b556502f32ab.zip tcl-43f72f639e769da85db050f2e571b556502f32ab.tar.gz tcl-43f72f639e769da85db050f2e571b556502f32ab.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 11 | ||||
| -rw-r--r-- | unix/tcl.m4 | 10 | ||||
| -rw-r--r-- | unix/tclEpollNotfy.c | 2 |
3 files changed, 6 insertions, 17 deletions
diff --git a/unix/configure b/unix/configure index 5ee7e01..6b9cedf 100755 --- a/unix/configure +++ b/unix/configure @@ -5085,9 +5085,7 @@ fi PLAT_SRCS="" LDAIX_SRC="" if test "x${SHLIB_VERSION}" = x; then : - SHLIB_VERSION=".1.0" -else - SHLIB_VERSION=".${SHLIB_VERSION}" + SHLIB_VERSION="1.0" fi case $system in AIX-*) @@ -9971,13 +9969,6 @@ $as_echo "#define USE_FIONBIO 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: FIONBIO" >&5 $as_echo "FIONBIO" >&6; } ;; - SunOS-4*) - -$as_echo "#define USE_FIONBIO 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: FIONBIO" >&5 -$as_echo "FIONBIO" >&6; } - ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: O_NONBLOCK" >&5 $as_echo "O_NONBLOCK" >&6; } diff --git a/unix/tcl.m4 b/unix/tcl.m4 index e21cc20..45922e0 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -971,8 +971,8 @@ AC_DEFUN([SC_CONFIG_SYSTEM], [ # shared libraries. The value of the symbol defaults to # "${LIBS}" if all of the dependent libraries should # be specified when creating a shared library. If -# dependent libraries should not be specified (as on -# SunOS 4.x, where they cause the link to fail, or in +# dependent libraries should not be specified (as on some +# SunOS systems, where they cause the link to fail, or in # general if Tcl and Tk aren't themselves shared # libraries), then this symbol has an empty string # as its value. @@ -1098,7 +1098,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ PLAT_OBJS="" PLAT_SRCS="" LDAIX_SRC="" - AS_IF([test "x${SHLIB_VERSION}" = x],[SHLIB_VERSION=".1.0"],[SHLIB_VERSION=".${SHLIB_VERSION}"]) + AS_IF([test "x${SHLIB_VERSION}" = x], [SHLIB_VERSION="1.0"]) case $system in AIX-*) AS_IF([test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"], [ @@ -2222,10 +2222,6 @@ AC_DEFUN([SC_BLOCKING_STYLE], [ AC_DEFINE(USE_FIONBIO, 1, [Should we use FIONBIO?]) AC_MSG_RESULT([FIONBIO]) ;; - SunOS-4*) - AC_DEFINE(USE_FIONBIO, 1, [Should we use FIONBIO?]) - AC_MSG_RESULT([FIONBIO]) - ;; *) AC_MSG_RESULT([O_NONBLOCK]) ;; diff --git a/unix/tclEpollNotfy.c b/unix/tclEpollNotfy.c index 5ed5d5d..088f314 100644 --- a/unix/tclEpollNotfy.c +++ b/unix/tclEpollNotfy.c @@ -21,7 +21,9 @@ #include <fcntl.h> #include <signal.h> #include <sys/epoll.h> +#ifdef HAVE_EVENTFD #include <sys/eventfd.h> +#endif /* HAVE_EVENTFD */ #include <sys/queue.h> #include <unistd.h> |