diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-14 19:56:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-14 19:56:43 (GMT) |
| commit | ea654cca69bc5e2bc539a27b0d7322f20466134f (patch) | |
| tree | 55eda7fdbc9face1592531a010869f1673fa7634 /unix | |
| parent | b2d00eb8176d84863a75aa771036a478115dbf57 (diff) | |
| parent | d64b6707b4b91c88d56b0147c0237411f47caa39 (diff) | |
| download | tcl-ea654cca69bc5e2bc539a27b0d7322f20466134f.zip tcl-ea654cca69bc5e2bc539a27b0d7322f20466134f.tar.gz tcl-ea654cca69bc5e2bc539a27b0d7322f20466134f.tar.bz2 | |
merge trunk
remove some EXTERN and CONST usages in tclUnixPort.h
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | unix/dltest/pkgb.c | 7 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index e43c252..3daad96 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -766,8 +766,8 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.7.10 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.tm; + @echo "Installing package http 2.7.11 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.11.tm; @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c index 3338eb5..039ad91 100644 --- a/unix/dltest/pkgb.c +++ b/unix/dltest/pkgb.c @@ -39,6 +39,10 @@ static int Pkgb_UnsafeObjCmd(ClientData clientData, *---------------------------------------------------------------------- */ +#ifndef Tcl_GetErrorLine +# define Tcl_GetErrorLine(interp) ((interp)->errorLine) +#endif + static int Pkgb_SubObjCmd( ClientData dummy, /* Not used. */ @@ -54,6 +58,9 @@ Pkgb_SubObjCmd( } if ((Tcl_GetIntFromObj(interp, objv[1], &first) != TCL_OK) || (Tcl_GetIntFromObj(interp, objv[2], &second) != TCL_OK)) { + char buf[TCL_INTEGER_SPACE]; + sprintf(buf, "%d", Tcl_GetErrorLine(interp)); + Tcl_AppendResult(interp, " in line: ", buf, NULL); return TCL_ERROR; } Tcl_SetObjResult(interp, Tcl_NewIntObj(first - second)); diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 0aa765a..32d14e1 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -283,7 +283,7 @@ MODULE_SCOPE int TclUnixSetBlockingMode(int fd, int mode); #endif #ifdef GETTOD_NOT_DECLARED -EXTERN int gettimeofday (struct timeval *tp, +extern int gettimeofday (struct timeval *tp, struct timezone *tzp); #endif @@ -627,8 +627,6 @@ typedef int socklen_t; #ifdef TCL_THREADS # include <pthread.h> -EXTERN struct tm *TclpLocaltime(CONST time_t *); -EXTERN struct tm *TclpGmtime(CONST time_t *); /* #define localtime(x) TclpLocaltime(x) * #define gmtime(x) TclpGmtime(x) */ # undef inet_ntoa @@ -646,7 +644,7 @@ EXTERN struct tm *TclpGmtime(CONST time_t *); # ifdef HAVE_PTHREAD_GETATTR_NP # define TclpPthreadGetAttrs pthread_getattr_np # ifdef GETATTRNP_NOT_DECLARED -EXTERN int pthread_getattr_np (pthread_t, pthread_attr_t *); +extern int pthread_getattr_np (pthread_t, pthread_attr_t *); # endif # endif /* HAVE_PTHREAD_GETATTR_NP */ # endif /* HAVE_PTHREAD_ATTR_GET_NP */ |