Check-in [e639016509]
Overview
Comment:Updated to not build zlib package under Tcl 8.6+ as it is natively provided
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:e6390165090667c7cca4f604a1b3af6812c28b3f
User & Date: rkeene on 2010-09-26 04:45:16
Other Links: manifest | tags
Context
2010-09-26
04:45
Corrected typo in ZipVFS check-in: 6e6c5fd01a user: rkeene tags: trunk
04:45
Updated to not build zlib package under Tcl 8.6+ as it is natively provided check-in: e639016509 user: rkeene tags: trunk
04:45
KitCreator 0.3.4.x check-in: 3f98704439 user: rkeene tags: trunk, 0.3.4
Changes

Modified kitsh/buildsrc/kitsh-0.0/kitInit.c from [87800da22f] to [a26486a2c9].

    35     35   
    36     36   #ifdef KIT_INCLUDES_ITCL
    37     37   Tcl_AppInitProc	Itcl_Init;
    38     38   #endif
    39     39   #ifdef KIT_INCLUDES_MK4TCL
    40     40   Tcl_AppInitProc	Mk4tcl_Init;
    41     41   #endif
    42         -Tcl_AppInitProc Vfs_Init, Rechan_Init, Zlib_Init;
           42  +Tcl_AppInitProc Vfs_Init, Rechan_Init;
    43     43   #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
    44     44   Tcl_AppInitProc	Pwb_Init;
           45  +#endif
           46  +#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
           47  +Tcl_AppInitProc Zlib_Init;
    45     48   #endif
    46     49   #ifdef TCL_THREADS
    47     50   Tcl_AppInitProc	Thread_Init;
    48     51   #endif
    49     52   #ifdef _WIN32
    50     53   Tcl_AppInitProc	Dde_Init, Registry_Init;
    51     54   #endif
................................................................................
   168    171   	Tcl_StaticPackage(0, "Mk4tcl", Mk4tcl_Init, NULL);
   169    172   #endif
   170    173   #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
   171    174   	Tcl_StaticPackage(0, "pwb", Pwb_Init, NULL);
   172    175   #endif 
   173    176   	Tcl_StaticPackage(0, "rechan", Rechan_Init, NULL);
   174    177   	Tcl_StaticPackage(0, "vfs", Vfs_Init, NULL);
          178  +#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
   175    179   	Tcl_StaticPackage(0, "zlib", Zlib_Init, NULL);
          180  +#endif
   176    181   #ifdef TCL_THREADS
   177    182   	Tcl_StaticPackage(0, "Thread", Thread_Init, NULL);
   178    183   #endif
   179    184   #ifdef _WIN32
   180    185   	Tcl_StaticPackage(0, "dde", Dde_Init, NULL);
   181    186   	Tcl_StaticPackage(0, "registry", Registry_Init, NULL);
   182    187   #endif

Modified kitsh/buildsrc/kitsh-0.0/zlib.c from [84ad9e9f88] to [d3ecfd237b].

     1      1   /* Written by Jean-Claude Wippler, as part of Tclkit.
     2      2    * March 2003 - placed in the public domain by the author.
     3      3    *
     4      4    * Interface to the "zlib" compression library
     5      5    */
     6      6   
     7         -#include "zlib.h"
     8      7   #include <tcl.h>
            8  +#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
            9  +#include "zlib.h"
     9     10   
    10     11   typedef struct {
    11     12     z_stream stream;
    12     13     Tcl_Obj *indata;
    13     14   } zlibstream;
    14     15   
    15     16   static int
................................................................................
   205    206   }
   206    207   
   207    208   int Zlib_Init(Tcl_Interp *interp)
   208    209   {
   209    210       Tcl_CreateObjCommand(interp, "zlib", ZlibCmd, 0, 0);
   210    211       return Tcl_PkgProvide( interp, "zlib", "1.1");
   211    212   }
          213  +#endif /* Tcl version less than 8.6 */