diff options
author | he <he> | 2014-03-05 13:52:29 +0000 |
---|---|---|
committer | he <he> | 2014-03-05 13:52:29 +0000 |
commit | 1e29017f5a8fb046808d1d323d93a35fe419fe40 (patch) | |
tree | 088783bb8311045c22556bdb33da03771e79bd1f /net/tcl-scotty/patches/patch-tnm_gdmo_tnmGdmoTcl.c | |
parent | 7a9fdb15b95a7dada37b6a3f982129ffc0cadfb6 (diff) | |
download | pkgsrc-1e29017f5a8fb046808d1d323d93a35fe419fe40.tar.gz |
Make tcl-scotty build with minimal warnings and install again.
This change is the result of a large sweep triggered by the new
Tcl which has const'ified many interfaces -- this follows suit with
many corresponding changes internally in scotty => lots of new
patches.
Also, change so as to not access interp->errorLine and
interp->result directly, use the accessor functions instead,
and turn off the corresponding compatibility defines.
The old patch files have been renamed and expanded, the new
scheme for naming patch files is used.
Only minimal functionality testing is done, but what has been
done shows that it basically works again.
PKGREVISION bumped.
Diffstat (limited to 'net/tcl-scotty/patches/patch-tnm_gdmo_tnmGdmoTcl.c')
-rw-r--r-- | net/tcl-scotty/patches/patch-tnm_gdmo_tnmGdmoTcl.c | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/net/tcl-scotty/patches/patch-tnm_gdmo_tnmGdmoTcl.c b/net/tcl-scotty/patches/patch-tnm_gdmo_tnmGdmoTcl.c new file mode 100644 index 00000000000..b093e5866ef --- /dev/null +++ b/net/tcl-scotty/patches/patch-tnm_gdmo_tnmGdmoTcl.c @@ -0,0 +1,94 @@ +$NetBSD: patch-tnm_gdmo_tnmGdmoTcl.c,v 1.1 2014/03/05 13:52:29 he Exp $ + +Constify. + +--- tnm/gdmo/tnmGdmoTcl.c.orig 1996-10-01 20:18:38.000000000 +0000 ++++ tnm/gdmo/tnmGdmoTcl.c +@@ -88,20 +88,20 @@ oid_result _ANSI_ARGS_((Tcl_Interp*, gd + + static int + GdmoNotification _ANSI_ARGS_((Tcl_Interp *interp, +- int argc, char **argv)); ++ int argc, const char **argv)); + static int + GdmoBehaviour _ANSI_ARGS_((Tcl_Interp *interp, +- int argc, char **argv)); ++ int argc, const char **argv)); + static int + GdmoLoad _ANSI_ARGS_((Tcl_Interp *interp, +- int argc, char **argv)); ++ int argc, const char **argv)); + static int + GdmoInfo _ANSI_ARGS_((Tcl_Interp *interp, +- int argc, char **argv)); ++ int argc, const char **argv)); + static int + GdmoCmd _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, +- int argc, char **argv)); ++ int argc, const char **argv)); + + + /*===========================================================================* +@@ -1282,7 +1282,7 @@ static int + GdmoNotification (interp, argc, argv) + Tcl_Interp *interp; + int argc; +- char **argv; ++ const char **argv; + { + if (argc == 2) { + if (!strcmp(argv[1], "info")) { +@@ -1360,7 +1360,7 @@ static int + GdmoBehaviour (interp, argc, argv) + Tcl_Interp *interp; + int argc; +- char **argv; ++ const char **argv; + { + if (argc == 2) { + if (!strcmp(argv[1], "info")) { +@@ -1424,11 +1424,11 @@ static int + GdmoLoad (interp, argc, argv) + Tcl_Interp *interp; + int argc; +- char **argv; ++ const char **argv; + { + Tcl_DString fileBuffer; +- char *library, *fileName, *file = argv[2]; +- char **fileArgv = NULL, **libArgv = NULL; ++ const char *library, *fileName, *file = argv[2]; ++ const char **fileArgv = NULL, **libArgv = NULL; + int fileArgc, libArgc; + int code = TCL_OK; + FILE *fin = NULL; +@@ -1463,8 +1463,8 @@ GdmoLoad (interp, argc, argv) + if (access(fileName, R_OK) != 0) { + + int tmpArgc; +- char **tmpArgv = (char **) ckalloc((libArgc + 2) * sizeof(char *)); +- ++ const char **tmpArgv = (const char **) ckalloc((libArgc + 2) * ++ sizeof(char *)); + if (library) { + for (tmpArgc = 0; tmpArgc < libArgc; tmpArgc++) { + tmpArgv[tmpArgc] = libArgv[tmpArgc]; +@@ -1551,7 +1551,7 @@ static int + GdmoInfo(interp, argc, argv) + Tcl_Interp *interp; + int argc; +- char **argv; ++ const char **argv; + { + if (argc != 3) { + Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], +@@ -1610,7 +1610,7 @@ GdmoCmd(clientData, interp, argc, argv) + ClientData clientData; + Tcl_Interp *interp; + int argc; +- char **argv; ++ const char **argv; + { + if (argc < 2) { + Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], |