Check-in [3fa36c2ea8]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:fix for ticket [ac3eeb2f9a]
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 3fa36c2ea8a23a31c84a8aefe79aa8b9649dbf34
User & Date: chw 2019-05-31 16:37:31
References
2019-05-31
16:48 Closed ticket [ac3eeb2f9a]: BLT and tcl::mathfunc::max plus 5 other changes artifact: 7425b0a5c4 user: chw
Context
2019-05-31
17:14
add tcl upstream changes check-in: 890981881c user: chw tags: trunk
16:37
fix for ticket [ac3eeb2f9a] check-in: 3fa36c2ea8 user: chw tags: trunk
15:11
fix for ticket [0e6bcf5d2a] check-in: f0d89b0c83 user: chw tags: trunk
Changes

Changes to jni/blt/configure.

3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
    SHLIB_CFLAGS="-export-dynamic -fPIC"
    SHLIB_LD="${CC}"
    SHLIB_LD_FLAGS='-shared -Wl,-E -Wl,-soname,$@'
    ;;

  *-*-cygwin* | *-*-mingw*)
    SHLIB_LD="${CC}"
    SHLIB_LD_FLAGS='-shared -Wl,-E -Wl,--out-implib,$@'
    EXTRA_LIB_SPECS="-lwinspool"
    LDFLAGS=""
    ;;

  *-dgux*)
    SHLIB_CFLAGS="-K PIC"
    SHLIB_LD="cc"







|







3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
    SHLIB_CFLAGS="-export-dynamic -fPIC"
    SHLIB_LD="${CC}"
    SHLIB_LD_FLAGS='-shared -Wl,-E -Wl,-soname,$@'
    ;;

  *-*-cygwin* | *-*-mingw*)
    SHLIB_LD="${CC}"
    SHLIB_LD_FLAGS='-shared -Wl,-E -Wl,--out-implib,$@.a'
    EXTRA_LIB_SPECS="-lwinspool"
    LDFLAGS=""
    ;;

  *-dgux*)
    SHLIB_CFLAGS="-K PIC"
    SHLIB_LD="cc"

Changes to jni/blt/configure.in.

1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
    SHLIB_CFLAGS="-export-dynamic -fPIC"
    SHLIB_LD="${CC}"
    SHLIB_LD_FLAGS='-shared -Wl,-E -Wl,-soname,$@'
    ;;

  *-*-cygwin* | *-*-mingw*)
    SHLIB_LD="${CC}"
    SHLIB_LD_FLAGS='-shared -Wl,-E -Wl,--out-implib,$@'
    EXTRA_LIB_SPECS="-lwinspool"
    LDFLAGS=""
    ;;

  *-dgux*)
    SHLIB_CFLAGS="-K PIC"
    SHLIB_LD="cc"







|







1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
    SHLIB_CFLAGS="-export-dynamic -fPIC"
    SHLIB_LD="${CC}"
    SHLIB_LD_FLAGS='-shared -Wl,-E -Wl,-soname,$@'
    ;;

  *-*-cygwin* | *-*-mingw*)
    SHLIB_LD="${CC}"
    SHLIB_LD_FLAGS='-shared -Wl,-E -Wl,--out-implib,$@.a'
    EXTRA_LIB_SPECS="-lwinspool"
    LDFLAGS=""
    ;;

  *-dgux*)
    SHLIB_CFLAGS="-K PIC"
    SHLIB_LD="cc"

Changes to jni/blt/src/bltInit.c.

441
442
443
444
445
446
447


448
449





450



451
452
453
454
455
456
457
	/* Initialize the BLT commands that only require Tcl. */
	for (p = tclCmds; *p != NULL; p++) {
	    if ((**p) (interp) != TCL_OK) {
		Tcl_DeleteNamespace(nsPtr);
		return TCL_ERROR;
	    }
	}


	args[0] = args[1] = TCL_EITHER;
	Tcl_CreateMathFunc(interp, "min", 2, args, MinMathProc, (ClientData)0);





	Tcl_CreateMathFunc(interp, "max", 2, args, MaxMathProc, (ClientData)0);



	Blt_RegisterArrayObj(interp);
	bltEmptyStringObjPtr = Tcl_NewStringObj("", -1);
	bltNaN = MakeNaN();
	if (Tcl_PkgProvide(interp, "BLT", BLT_VERSION) != TCL_OK) {
	    return TCL_ERROR;
	}
	Tcl_SetAssocData(interp, BLT_THREAD_KEY, NULL, 







>
>
|
|
>
>
>
>
>
|
>
>
>







441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
	/* Initialize the BLT commands that only require Tcl. */
	for (p = tclCmds; *p != NULL; p++) {
	    if ((**p) (interp) != TCL_OK) {
		Tcl_DeleteNamespace(nsPtr);
		return TCL_ERROR;
	    }
	}
	if ((Tcl_EvalEx(interp, "info functions min", -1, 0) != TCL_OK) ||
		(strcmp(Tcl_GetStringResult(interp), "min") != 0)) {
	    args[0] = args[1] = TCL_EITHER;
	    Tcl_CreateMathFunc(interp, "min", 2, args,
			       MinMathProc, (ClientData)0);
	}
	if ((Tcl_EvalEx(interp, "info functions max", -1, 0) != TCL_OK) ||
		(strcmp(Tcl_GetStringResult(interp), "max") != 0)) {
	    args[0] = args[1] = TCL_EITHER;
	    Tcl_CreateMathFunc(interp, "max", 2, args,
			       MaxMathProc, (ClientData)0);
	}
	Tcl_ResetResult(interp);
	Blt_RegisterArrayObj(interp);
	bltEmptyStringObjPtr = Tcl_NewStringObj("", -1);
	bltNaN = MakeNaN();
	if (Tcl_PkgProvide(interp, "BLT", BLT_VERSION) != TCL_OK) {
	    return TCL_ERROR;
	}
	Tcl_SetAssocData(interp, BLT_THREAD_KEY, NULL,