Check-in [cd8d37311d]
Not logged in

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

Overview
Comment:Repaired module loading under windows
Timelines: family | ancestors | trunk
Files: files | file ages | folders
SHA1:cd8d37311de78d65f4f3061a56473878987a1606
User & Date: hypnotoad 2014-12-12 20:02:57
Context
2014-12-12
20:02
Repaired module loading under windows Leaf check-in: cd8d37311d user: hypnotoad tags: trunk
19:52
Updated autoconf and TEA installer check-in: 57f046e114 user: hypnotoad tags: trunk
Changes

Changes to src/htmltcl.c.

2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895

2896
2897
2898
2899
2900
2901

2902
2903
2904
2905
2906
2907
2908
....
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
....
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
    iRet = Tcl_NumUtfChars(zArg, iByteOffset);
    Tcl_SetObjResult(interp, Tcl_NewIntObj(iRet));
    return TCL_OK;
}


/*
 * Define the DLL_EXPORT macro, which must be set to something or other in
 * order to export the Tkhtml_Init and Tkhtml_SafeInit symbols from a win32
 * DLL file. I don't entirely understand the ins and outs of this, the
 * block below was copied verbatim from another program.
 */
#if INTERFACE
#define DLL_EXPORT
#endif

#if defined(USE_TCL_STUBS) && defined(__WIN32__)
# undef DLL_EXPORT
# define DLL_EXPORT __declspec(dllexport)
#endif
#ifndef DLL_EXPORT
#define DLL_EXPORT

#endif

/*
 *---------------------------------------------------------------------------
 *
 * Tkhtml_Init --
 *
................................................................................
 *     Tcl result.
 *
 * Side effects:
 *     Loads the tkhtml package into interpreter interp.
 *
 *---------------------------------------------------------------------------
 */
DLL_EXPORT int Tkhtml_Init(interp)
    Tcl_Interp *interp;
{
    int rc;

    /* Require stubs libraries version 8.4 or greater. */
#ifdef USE_TCL_STUBS
    if (Tcl_InitStubs(interp, "8.4", 0) == 0) {
................................................................................
 *     Tcl result.
 *
 * Side effects:
 *     Loads the tkhtml package into interpreter interp.
 *
 *---------------------------------------------------------------------------
 */
DLL_EXPORT int Tkhtml_SafeInit(interp)
    Tcl_Interp *interp;
{
    return Tkhtml_Init(interp);
}







|
|
<
<
|
<
<
<
>
|
|
<
<
<
<
>







 







|







 







|




2881
2882
2883
2884
2885
2886
2887
2888
2889


2890



2891
2892
2893




2894
2895
2896
2897
2898
2899
2900
2901
....
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
....
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
    iRet = Tcl_NumUtfChars(zArg, iByteOffset);
    Tcl_SetObjResult(interp, Tcl_NewIntObj(iRet));
    return TCL_OK;
}


/*
** Provide a dummy Tcl_InitStubs if we are using this as a static
** library.


*/




#ifndef USE_TCL_STUBS
# undef  Tcl_InitStubs




# define Tcl_InitStubs(a,b,c) TCL_VERSION
#endif

/*
 *---------------------------------------------------------------------------
 *
 * Tkhtml_Init --
 *
................................................................................
 *     Tcl result.
 *
 * Side effects:
 *     Loads the tkhtml package into interpreter interp.
 *
 *---------------------------------------------------------------------------
 */
int DLLEXPORT Tkhtml_Init(interp)
    Tcl_Interp *interp;
{
    int rc;

    /* Require stubs libraries version 8.4 or greater. */
#ifdef USE_TCL_STUBS
    if (Tcl_InitStubs(interp, "8.4", 0) == 0) {
................................................................................
 *     Tcl result.
 *
 * Side effects:
 *     Loads the tkhtml package into interpreter interp.
 *
 *---------------------------------------------------------------------------
 */
int DLLEXPORT Tkhtml_SafeInit(interp)
    Tcl_Interp *interp;
{
    return Tkhtml_Init(interp);
}