Diff
Not logged in

Differences From Artifact [847064b4a9]:

To Artifact [c5d12f2ff4]:


800
801
802
803
804
805
806
807
808



809
810

811
812
813
814
815
816
817
    static OSVERSIONINFOW osInfo;
    static int osInfoInitialized = 0;
    char buffer[TCL_INTEGER_SPACE * 2];
#elif !defined(NO_UNAME)
    struct utsname name;
#endif
    int unameOK;
    const char *p, *q;
    Tcl_Obj *pkgListObj = Tcl_NewObj();




#ifdef HAVE_COREFOUNDATION

    char tclLibPath[MAXPATHLEN + 1];

    /*
     * Set msgcat fallback locale to current CFLocale identifier.
     */

#if MAC_OS_X_VERSION_MAX_ALLOWED > 1020







<

>
>
>


>







800
801
802
803
804
805
806

807
808
809
810
811
812
813
814
815
816
817
818
819
820
    static OSVERSIONINFOW osInfo;
    static int osInfoInitialized = 0;
    char buffer[TCL_INTEGER_SPACE * 2];
#elif !defined(NO_UNAME)
    struct utsname name;
#endif
    int unameOK;

    Tcl_Obj *pkgListObj = Tcl_NewObj();
    Tcl_Obj *itemPtr ,*pkgPathPtr;
    Tcl_Size idx ,length;
    int status;

#ifdef HAVE_COREFOUNDATION
    const char *p, *q;
    char tclLibPath[MAXPATHLEN + 1];

    /*
     * Set msgcat fallback locale to current CFLocale identifier.
     */

#if MAC_OS_X_VERSION_MAX_ALLOWED > 1020
861
862
863
864
865
866
867
868
869
870

871

872



873



874
875

876
877
878
879
880
881
882
		    Tcl_ListObjAppendElement(NULL, pkgListObj, Tcl_NewStringObj(tclLibPath, -1));
		}
		CFRelease(frameworksURL);
	    }
	}
    }
#endif /* HAVE_COREFOUNDATION */
    p = pkgPath;
    while ((q = strchr(p, ':')) != NULL) {
	Tcl_ListObjAppendElement(NULL, pkgListObj, Tcl_NewStringObj(p, q - p));

	p = q + 1;

    }



    if (*p) {



	Tcl_ListObjAppendElement(NULL, pkgListObj, Tcl_NewStringObj(p, -1));
    }

    Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_pkgPath", -1), NULL, pkgListObj, TCL_GLOBAL_ONLY);
    {
	/* Some platforms build configure scripts expect ~ expansion so do that */
	Tcl_Obj *origPaths;
	Tcl_Obj *resolvedPaths;

	origPaths = Tcl_GetVar2Ex(interp, "tcl_pkgPath", NULL, TCL_GLOBAL_ONLY);







|
<
|
>
|
>

>
>
>
|
>
>
>
|

>







864
865
866
867
868
869
870
871

872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
		    Tcl_ListObjAppendElement(NULL, pkgListObj, Tcl_NewStringObj(tclLibPath, -1));
		}
		CFRelease(frameworksURL);
	    }
	}
    }
#endif /* HAVE_COREFOUNDATION */
    pkgPathPtr = Tcl_NewStringObj(pkgPath, -1);

    status = Tcl_ListObjLength(interp ,pkgPathPtr ,&length);
    if (status) {
	Tcl_Panic("%s {error processing pkgPath (TCL_PACKAGE_PATH)"
	    ,"TclpSetVariables");
    }

    for (idx = 0; idx < length; idx++) {
	status = Tcl_ListObjIndex(interp ,pkgPathPtr ,idx ,&itemPtr);
	if (status) {
	    Tcl_Panic("%s {error processing pkgPath (TCL_PACKAGE_PATH) item %"
		TCL_SIZE_MODIFIER "d" ,"TclpSetVariables" ,idx);
	}
	Tcl_ListObjAppendElement(interp ,pkgListObj ,itemPtr);
    }

    Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_pkgPath", -1), NULL, pkgListObj, TCL_GLOBAL_ONLY);
    {
	/* Some platforms build configure scripts expect ~ expansion so do that */
	Tcl_Obj *origPaths;
	Tcl_Obj *resolvedPaths;

	origPaths = Tcl_GetVar2Ex(interp, "tcl_pkgPath", NULL, TCL_GLOBAL_ONLY);