Check-in [38e824c84e]
Not logged in

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

Overview
Comment:fix some compiler warnings in tcl
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:38e824c84ef1929742e522f6845dd5bbbf2c6291
User & Date: chw 2019-03-16 16:58:39
Context
2019-03-16
16:59
fix compiler warnings in tk check-in: 0c2181284c user: chw tags: trunk
16:58
fix some compiler warnings in tcl check-in: 38e824c84e user: chw tags: trunk
07:54
update freetype to version 2.10.0 check-in: 3f0a20716d user: chw tags: trunk
Changes

Changes to jni/tcl/generic/tcl.h.

420
421
422
423
424
425
426
427
428
429
430
431
432




433
434
435
436
437
438
439
#   define Tcl_LongAsWide(val)		((long)(val))
#   define Tcl_WideAsDouble(val)	((double)((long)(val)))
#   define Tcl_DoubleAsWide(val)	((long)((double)(val)))
#   ifndef TCL_LL_MODIFIER
#      define TCL_LL_MODIFIER		"l"
#   endif /* !TCL_LL_MODIFIER */
#else /* TCL_WIDE_INT_IS_LONG */
/*
 * The next short section of defines are only done when not running on Windows
 * or some other strange platform.
 */
#   ifndef TCL_LL_MODIFIER
#      define TCL_LL_MODIFIER		"ll"




#   endif /* !TCL_LL_MODIFIER */
#   define Tcl_WideAsLong(val)		((long)((Tcl_WideInt)(val)))
#   define Tcl_LongAsWide(val)		((Tcl_WideInt)((long)(val)))
#   define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
#   define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
#endif /* TCL_WIDE_INT_IS_LONG */








|
|
|
|
|
|
>
>
>
>







420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
#   define Tcl_LongAsWide(val)		((long)(val))
#   define Tcl_WideAsDouble(val)	((double)((long)(val)))
#   define Tcl_DoubleAsWide(val)	((long)((double)(val)))
#   ifndef TCL_LL_MODIFIER
#      define TCL_LL_MODIFIER		"l"
#   endif /* !TCL_LL_MODIFIER */
#else /* TCL_WIDE_INT_IS_LONG */
#   ifndef TCL_LL_MODIFIER
#      if defined(_WIN32)
#         ifdef __BORLANDC__
#            define TCL_LL_MODIFIER	"L"
#         else /* __BORLANDC__ */
#            define TCL_LL_MODIFIER	"I64"
#         endif /* __BORLANDC__ */
#      else
#         define TCL_LL_MODIFIER	"ll"
#      endif
#   endif /* !TCL_LL_MODIFIER */
#   define Tcl_WideAsLong(val)		((long)((Tcl_WideInt)(val)))
#   define Tcl_LongAsWide(val)		((Tcl_WideInt)((long)(val)))
#   define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
#   define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
#endif /* TCL_WIDE_INT_IS_LONG */

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

46
47
48
49
50
51
52

53

54
55
56
57
58
59
60

#define ZIPFS_MEMLOAD 1

#include <sys/syscall.h>
#include <sys/utsname.h>
#include <dlfcn.h>


#define __NR_memfd_create 319


/* Wrapper to call memfd_create(2). */
static inline int
memfd_create(const char *name, unsigned int flags)
{
    return syscall(__NR_memfd_create, name, flags);
}







>

>







46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62

#define ZIPFS_MEMLOAD 1

#include <sys/syscall.h>
#include <sys/utsname.h>
#include <dlfcn.h>

#ifndef __NR_memfd_create
#define __NR_memfd_create 319
#endif

/* Wrapper to call memfd_create(2). */
static inline int
memfd_create(const char *name, unsigned int flags)
{
    return syscall(__NR_memfd_create, name, flags);
}

jni/tcl/tests/tcltest.test became a regular file.

Changes to jni/tcl/win/tclWinDde.c.

1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
    DdeEnumServices *es;
    TCHAR sz[255];
    Tcl_DString dString;

#ifdef _WIN64
    es = (DdeEnumServices *) GetWindowLongPtr(hwnd, GWLP_USERDATA);
#else
    es = (struct DdeEnumServices *) GetWindowLong(hwnd, GWL_USERDATA);
#endif

    if (((es->service == (ATOM)0) || (es->service == service))
	    && ((es->topic == (ATOM)0) || (es->topic == topic))) {
	Tcl_Obj *matchPtr = Tcl_NewListObj(0, NULL);
	Tcl_Obj *resultPtr = Tcl_GetObjResult(es->interp);








|







1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
    DdeEnumServices *es;
    TCHAR sz[255];
    Tcl_DString dString;

#ifdef _WIN64
    es = (DdeEnumServices *) GetWindowLongPtr(hwnd, GWLP_USERDATA);
#else
    es = (DdeEnumServices *) GetWindowLong(hwnd, GWL_USERDATA);
#endif

    if (((es->service == (ATOM)0) || (es->service == service))
	    && ((es->topic == (ATOM)0) || (es->topic == topic))) {
	Tcl_Obj *matchPtr = Tcl_NewListObj(0, NULL);
	Tcl_Obj *resultPtr = Tcl_GetObjResult(es->interp);

Changes to jni/tcl/win/tclWinPort.h.

506
507
508
509
510
511
512

513

514
515
516
517
518
519
520

#define	TCL_PLATFORM_TRANSLATION	TCL_TRANSLATE_CRLF

/*
 * Declare dynamic loading extension macro.
 */


#define TCL_SHLIB_EXT ".dll"


/*
 * The following define ensures that we use the native putenv
 * implementation to modify the environment array.  This keeps
 * the C level environment in synch with the system level environment.
 */








>

>







506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522

#define	TCL_PLATFORM_TRANSLATION	TCL_TRANSLATE_CRLF

/*
 * Declare dynamic loading extension macro.
 */

#ifndef TCL_SHLIB_EXT
#define TCL_SHLIB_EXT ".dll"
#endif

/*
 * The following define ensures that we use the native putenv
 * implementation to modify the environment array.  This keeps
 * the C level environment in synch with the system level environment.
 */