diff --git a/src/libmdb/backend.c b/src/libmdb/backend.c
index fe7dda8..f541bd2 100644
--- a/src/libmdb/backend.c
+++ b/src/libmdb/backend.c
@@ -294,7 +294,7 @@ mdb_get_colbacktype_string(const MdbColumn *col)
 	const MdbBackendType *type = mdb_get_colbacktype(col);
 	if (!type) {
    		// return NULL;
-		static __thread char buf[16];
+		static TLS char buf[16];
 		snprintf(buf, sizeof(buf), "Unknown_%04x", col->col_type);
 		return buf;
 	}
diff --git a/src/libmdb/options.c b/src/libmdb/options.c
index 8d377ff..7f0a341 100644
--- a/src/libmdb/options.c
+++ b/src/libmdb/options.c
@@ -24,8 +24,8 @@
 
 #define DEBUG 1
 
-static __thread unsigned long opts;
-static __thread int optset;
+static TLS unsigned long opts;
+static TLS int optset;
 
 static void load_options(void);
 
diff --git a/src/odbc/connectparams.c b/src/odbc/connectparams.c
index 2d8cbb0..47b55de 100644
--- a/src/odbc/connectparams.c
+++ b/src/odbc/connectparams.c
@@ -93,7 +93,7 @@ void FreeConnectParams (ConnectParams* params)
 
 gchar* GetConnectParam (ConnectParams* params, const gchar* paramName)
 {
-	static __thread char tmp[FILENAME_MAX];
+	static TLS char tmp[FILENAME_MAX];
 
 	/* use old servername */
 	tmp[0] = '\0';
@@ -317,4 +317,4 @@ ODBCINSTGetProperties(HODBCINSTPROPERTY hLastProperty)
 }
 
 #endif
-/** @}*/
\ No newline at end of file
+/** @}*/