@@ -23,10 +23,14 @@
 
 #include "tlsInt.h"
 #include "tclOpts.h"
 #include <stdlib.h>
 
+#if TCL_MAJOR_VERSION < 9
+    typedef int Tcl_Size;
+#endif
+
 /*
  * External functions
  */
 
 /*
@@ -271,11 +275,11 @@
 static int
 VerifyCallback(int ok, X509_STORE_CTX *ctx)
 {
     Tcl_Obj *cmdPtr, *result;
     char *errStr, *string;
-    int length;
+    Tcl_Size length;
     SSL   *ssl		= (SSL*)X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
     X509  *cert		= X509_STORE_CTX_get_current_cert(ctx);
     State *statePtr	= (State*)SSL_get_app_data(ssl);
     int depth		= X509_STORE_CTX_get_error_depth(ctx);
     int err		= X509_STORE_CTX_get_error(ctx);
@@ -367,11 +371,11 @@
     dprintf("Called");
 
     if (msg && *msg) {
 	Tcl_SetErrorCode(statePtr->interp, "SSL", msg, (char *)NULL);
     } else {
-	msg = Tcl_GetStringFromObj(Tcl_GetObjResult(statePtr->interp), NULL);
+	msg = Tcl_GetStringFromObj(Tcl_GetObjResult(statePtr->interp), (Tcl_Size *)NULL);
     }
     statePtr->err = msg;
 
     if (statePtr->callback == (Tcl_Obj*)NULL) {
 	char buf[BUFSIZ];
@@ -649,11 +653,11 @@
 	if (objc != 2) {
 		Tcl_WrongNumArgs(interp, 1, objv, "channel");
 		return(TCL_ERROR);
 	}
 
-	chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL), NULL);
+	chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], (Tcl_Size *)NULL), NULL);
 	if (chan == (Tcl_Channel) NULL) {
 		return(TCL_ERROR);
 	}
 
 	/*
@@ -780,11 +784,11 @@
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "channel ?options?");
 	return TCL_ERROR;
     }
 
-    chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL), NULL);
+    chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], (Tcl_Size *) NULL), NULL);
     if (chan == (Tcl_Channel) NULL) {
 	return TCL_ERROR;
     }
 
     /*
@@ -791,11 +795,11 @@
      * Make sure to operate on the topmost channel
      */
     chan = Tcl_GetTopChannel(chan);
 
     for (idx = 2; idx < objc; idx++) {
-	char *opt = Tcl_GetStringFromObj(objv[idx], NULL);
+	char *opt = Tcl_GetStringFromObj(objv[idx], (Tcl_Size *)NULL);
 
 	if (opt[0] != '-')
 	    break;
 
 	OPTSTR( "-cadir", CAdir);
@@ -1414,16 +1418,16 @@
 
     dprintf("Called");
 
     switch (objc) {
 	case 2:
-	    channelName = Tcl_GetStringFromObj(objv[1], NULL);
+	    channelName = Tcl_GetStringFromObj(objv[1], (Tcl_Size *) NULL);
 	    break;
 
 	case 3:
 	    if (!strcmp (Tcl_GetString (objv[1]), "-local")) {
-		channelName = Tcl_GetStringFromObj(objv[2], NULL);
+		channelName = Tcl_GetStringFromObj(objv[2], (Tcl_Size *)NULL);
 		break;
 	    }
 	    /* else fall... */
 	default:
 	    Tcl_WrongNumArgs(interp, 1, objv, "?-local? channel");
@@ -1774,11 +1778,11 @@
  *	 create the ssl command, initialise ssl context
  *
  *-------------------------------------------------------------------
  */
 
-DLLEXPORT int Tls_Init(Tcl_Interp *interp) {
+int DLLEXPORT Tls_Init(Tcl_Interp *interp) {
 	const char tlsTclInitScript[] = {
 #include "tls.tcl.h"
             0x00
 	};
 
@@ -1789,11 +1793,11 @@
 	 */
 	if (
 #ifdef USE_TCL_STUBS
 	    Tcl_InitStubs(interp, "8.4", 0)
 #else
-	    Tcl_PkgRequire(interp, "Tcl", "8.4", 0)
+	    Tcl_PkgRequire(interp, "Tcl", "8.4-", 0)
 #endif
 	     == NULL) {
 		return TCL_ERROR;
 	}
 
@@ -1834,11 +1838,11 @@
  *		A standard Tcl error code.
  *
  *------------------------------------------------------*
  */
 
-DLLEXPORT int Tls_SafeInit(Tcl_Interp *interp) {
+int DLLEXPORT Tls_SafeInit(Tcl_Interp *interp) {
 	dprintf("Called");
 	return(Tls_Init(interp));
 }
 
 /*