fix(util): the preset dict types are not exported correctly

Author: lc-soft

include/LCUI/util/dict.h

@@ -238,9 +238,15 @@ LCUI_API int Dict_RehashMilliseconds(Dict *d, int ms);
 LCUI_API void Dict_SetHashFunctionSeed(unsigned int initval);
 LCUI_API unsigned int Dict_GetHashFunctionSeed(void);
 
+LCUI_API unsigned int StringKeyDict_KeyHash(const void *key);
+LCUI_API int StringKeyDict_KeyCompare(void *privdata, const void *key1,
+				      const void *key2);
+LCUI_API void *StringKeyDict_KeyDup(void *privdata, const void *key);
+LCUI_API void StringKeyDict_KeyDestructor(void *privdata, void *key);
+
 /* Hash table types */
-extern DictType DictType_StringKey;
-extern DictType DictType_StringCopyKey;
+LCUI_API DictType DictType_StringKey;
+LCUI_API DictType DictType_StringCopyKey;
 
 LCUI_END_HEADER
 

include/LCUI_Build.h

@@ -32,14 +32,14 @@
 #define LCUI_BUILD_H
 
 #if defined(__GNUC__)
-#define LCUI_API
-#else /* newer compiler */
+#define LCUI_API extern
+#else
 #ifdef LCUI_EXPORTS
 #define LCUI_API __declspec(dllexport)
 #else
-#define LCUI_API
+#define LCUI_API __declspec(dllimport)
+#endif
 #endif
-#endif /* compiler */
 
 #if defined(_WIN32) && !defined(__cplusplus)
 #define INLINE __inline

src/util/dict.c

@@ -679,7 +679,7 @@ void Dict_DisableResize(void)
 	dict_can_resize = 0;
 }
 
-static unsigned int StringCopyKeyDict_KeyHash(const void *key)
+unsigned int StringKeyDict_KeyHash(const void *key)
 {
 	const char *buf = key;
 	unsigned int hash = dict_hash_function_seed;
@@ -689,7 +689,7 @@ static unsigned int StringCopyKeyDict_KeyHash(const void *key)
 	return hash;
 }
 
-static int StringCopyKeyDict_KeyCompare(void *privdata, const void *key1,
+int StringKeyDict_KeyCompare(void *privdata, const void *key1,
 					const void *key2)
 {
 	if (strcmp(key1, key2) == 0) {
@@ -698,22 +698,22 @@ static int StringCopyKeyDict_KeyCompare(void *privdata, const void *key1,
 	return 0;
 }
 
-static void *StringCopyKeyDict_KeyDup(void *privdata, const void *key)
+void *StringKeyDict_KeyDup(void *privdata, const void *key)
 {
 	char *newkey = malloc((strlen(key) + 1) * sizeof(char));
 	strcpy(newkey, key);
 	return newkey;
 }
 
-static void StringCopyKeyDict_KeyDestructor(void *privdata, void *key)
+void StringKeyDict_KeyDestructor(void *privdata, void *key)
 {
 	free(key);
 }
 
-DictType DictType_StringKey = { StringCopyKeyDict_KeyHash,    NULL, NULL,
-				StringCopyKeyDict_KeyCompare, NULL, NULL };
+DictType DictType_StringKey = { StringKeyDict_KeyHash,    NULL, NULL,
+				StringKeyDict_KeyCompare, NULL, NULL };
 
 DictType DictType_StringCopyKey = {
-	StringCopyKeyDict_KeyHash,    StringCopyKeyDict_KeyDup,        NULL,
-	StringCopyKeyDict_KeyCompare, StringCopyKeyDict_KeyDestructor, NULL
+	StringKeyDict_KeyHash,    StringKeyDict_KeyDup,        NULL,
+	StringKeyDict_KeyCompare, StringKeyDict_KeyDestructor, NULL
 };