Check-in [c90839e680]
Not logged in

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

Overview
Comment:merge with trunk
Timelines: family | ancestors | descendants | both | wtf-8-experiment
Files: files | file ages | folders
SHA1: c90839e6808e2ede33f45565f137a0dc05c9581e
User & Date: chw 2019-05-22 05:13:32
Context
2019-05-24
22:18
merge with trunk check-in: 71cc564ed0 user: chw tags: wtf-8-experiment
2019-05-22
05:13
merge with trunk check-in: c90839e680 user: chw tags: wtf-8-experiment
05:11
tweak undroidwish build for openbsd 6.5 check-in: 1554a23454 user: chw tags: trunk
2019-05-21
05:03
merge with trunk check-in: 71e9d472c8 user: chw tags: wtf-8-experiment
Changes

Changes to jni/tcl/generic/tclHash.c.

322
323
324
325
326
327
328


329

330
331
332
333
334
335
336
	for (hPtr = tablePtr->buckets[index]; hPtr != NULL;
		hPtr = hPtr->nextPtr) {
#if TCL_HASH_KEY_STORE_HASH
	    if (hash != PTR2UINT(hPtr->hash)) {
		continue;
	    }
#endif


	    if (((void *) key == hPtr) || compareKeysProc((void *) key, hPtr)) {

		if (newPtr) {
		    *newPtr = 0;
		}
		return hPtr;
	    }
	}
    } else {







>
>
|
>







322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
	for (hPtr = tablePtr->buckets[index]; hPtr != NULL;
		hPtr = hPtr->nextPtr) {
#if TCL_HASH_KEY_STORE_HASH
	    if (hash != PTR2UINT(hPtr->hash)) {
		continue;
	    }
#endif
	    /* if keys pointers or values are equal */
	    if ((key == hPtr->key.oneWordValue)
		|| compareKeysProc((void *) key, hPtr)
	    ) {
		if (newPtr) {
		    *newPtr = 0;
		}
		return hPtr;
	    }
	}
    } else {

Changes to jni/tcl/generic/tclTest.c.

4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
}
 
/*
 *----------------------------------------------------------------------
 *
 * TestupvarCmd --
 *
 *	This procedure implements the "testupvar2" command.  It is used
 *	to test Tcl_UpVar and Tcl_UpVar2.
 *
 * Results:
 *	A standard Tcl result.
 *
 * Side effects:
 *	Creates or modifies an "upvar" reference.







|







4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
}
 
/*
 *----------------------------------------------------------------------
 *
 * TestupvarCmd --
 *
 *	This procedure implements the "testupvar" command.  It is used
 *	to test Tcl_UpVar and Tcl_UpVar2.
 *
 * Results:
 *	A standard Tcl result.
 *
 * Side effects:
 *	Creates or modifies an "upvar" reference.

Changes to undroid/build-undroidwish-openbsd.sh.

577
578
579
580
581
582
583


584
585
586
587
588
589
590
  cd SDL2
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --prefix=${PFX_HERE} \
    --disable-shared --disable-arts --disable-esd --disable-nas \
    --disable-ibus --disable-alsa --disable-pulseaudio \
    --disable-rpath --disable-video-opengles2 \
    --disable-video-vulkan --disable-fcitx || exit 1


  MAKE=gmake gmake || exit 1
  MAKE=gmake gmake install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build Tk (SDL2 backend, static) ... "







>
>







577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
  cd SDL2
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --prefix=${PFX_HERE} \
    --disable-shared --disable-arts --disable-esd --disable-nas \
    --disable-ibus --disable-alsa --disable-pulseaudio \
    --disable-rpath --disable-video-opengles2 \
    --disable-video-vulkan --disable-fcitx || exit 1
  # clang -O3 on OpenBSD 6.5 produces buggy X11 init code, thus...
  perl -pi -e 's/-O3/-O1/g' Makefile
  MAKE=gmake gmake || exit 1
  MAKE=gmake gmake install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build Tk (SDL2 backend, static) ... "