diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-07-05 19:56:12 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-07-05 19:56:12 (GMT) |
| commit | 50dc81f5c58c427ee5a65ba5d27c16c0822b9083 (patch) | |
| tree | 20de47fe9848ab65827f368dec417707a666eb3b | |
| parent | 1ac20bac749a345520e4c261dcfe77c88fe0aede (diff) | |
| parent | 0d91e00091b24861e400724da7fd54fb8beb3305 (diff) | |
| download | tcl-50dc81f5c58c427ee5a65ba5d27c16c0822b9083.zip tcl-50dc81f5c58c427ee5a65ba5d27c16c0822b9083.tar.gz tcl-50dc81f5c58c427ee5a65ba5d27c16c0822b9083.tar.bz2 | |
merge trunk
| -rw-r--r-- | generic/tclConfig.c | 2 | ||||
| -rw-r--r-- | generic/tclResult.c | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/generic/tclConfig.c b/generic/tclConfig.c index e5acf5e..2fb3e92 100644 --- a/generic/tclConfig.c +++ b/generic/tclConfig.c @@ -211,7 +211,7 @@ QueryConfigObjCmd( }; Tcl_DString conv; Tcl_Encoding venc = NULL; - CONST char *value; + const char *value; if ((objc < 2) || (objc > 3)) { Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?arg?"); diff --git a/generic/tclResult.c b/generic/tclResult.c index 014ea1b..2f2563a 100644 --- a/generic/tclResult.c +++ b/generic/tclResult.c @@ -1112,6 +1112,7 @@ Tcl_SetObjErrorCode( *---------------------------------------------------------------------- */ +#undef Tcl_GetErrorLine int Tcl_GetErrorLine( Tcl_Interp *interp) @@ -1129,6 +1130,7 @@ Tcl_GetErrorLine( *---------------------------------------------------------------------- */ +#undef Tcl_SetErrorLine void Tcl_SetErrorLine( Tcl_Interp *interp, diff --git a/unix/tcl.m4 b/unix/tcl.m4 index b69d5a6..4656e61 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -2255,9 +2255,9 @@ AC_DEFUN([SC_PATH_X], [ not_really_there="" if test "$no_x" = ""; then if test "$x_includes" = ""; then - AC_TRY_CPP([#include <X11/XIntrinsic.h>], , not_really_there="yes") + AC_TRY_CPP([#include <X11/Xlib.h>], , not_really_there="yes") else - if test ! -r $x_includes/X11/Intrinsic.h; then + if test ! -r $x_includes/X11/Xlib.h; then not_really_there="yes" fi fi @@ -2265,11 +2265,11 @@ AC_DEFUN([SC_PATH_X], [ if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then AC_MSG_CHECKING([for X11 header files]) found_xincludes="no" - AC_TRY_CPP([#include <X11/Intrinsic.h>], found_xincludes="yes", found_xincludes="no") + AC_TRY_CPP([#include <X11/Xlib.h>], found_xincludes="yes", found_xincludes="no") if test "$found_xincludes" = "no"; then dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include" for i in $dirs ; do - if test -r $i/X11/Intrinsic.h; then + if test -r $i/X11/Xlib.h; then AC_MSG_RESULT([$i]) XINCLUDES=" -I$i" found_xincludes="yes" |