update

Makefile

@@ -100,7 +100,7 @@ else
 ifeq ($(OS), Android)
 	LDFLAGS += -Wl,-Bdynamic -lstdc++ -lm -llog
 else
-	LDFLAGS += -Wl,-Bdynamic -lstdc++ -lpthread -lm
+	LDFLAGS += -lstdc++ -lpthread -lm
 endif
 endif
 

h.h

@@ -32,7 +32,6 @@
 
 #include "hlog.h"
 #include "hstring.h"
-#include "hmain.h"
 #include "hframe.h"
 #endif
 

hdef.h

@@ -101,6 +101,30 @@ typedef void (*procedure_t)(void* userdata);
 #define BITGET(i, n) ((i) & (1u << (n)))
 #endif
 
+#ifndef LOWER
+#define LOWER(c)    ((c) | 0x20)
+#endif
+
+#ifndef UPPER
+#define UPPER(c)    ((c) & ~0x20)
+#endif
+
+#ifndef IS_NUM
+#define IS_NUM(c)   ((c) >= '0' && (c) <= '9')
+#endif
+
+#ifndef IS_ALPHA
+#define IS_ALPHA(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'A'))
+#endif
+
+#ifndef IS_ALPHANUM
+#define IS_ALPHANUM(c) (IS_NUM(c) || IS_ALPHA(c))
+#endif
+
+#ifndef IS_HEX
+#define IS_HEX(c) (IS_NUM(c) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
+#endif
+
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
 #endif

hsysinfo.h

@@ -3,7 +3,7 @@
 
 #include "hplatform.h"
 
-#ifdef OS_UNIX
+#ifdef OS_LINUX
 #include <sys/sysinfo.h>
 #endif
 

htime.c

@@ -19,7 +19,7 @@ inline unsigned long long gethrtime() {
     clock_gettime(CLOCK_MONOTONIC, &ts);
     return ts.tv_sec*(unsigned long long)1000000 + ts.tv_nsec / 1000;
 #else
-    return clock()* / (double)CLOCKS_PER_SEC * 1000000;
+    return clock() / (double)CLOCKS_PER_SEC * 1000000;
 #endif
 }
 

hversion.h

@@ -19,6 +19,6 @@ inline const char* get_static_version() {
     return H_VERSION_STRING;
 }
 
-const char* get_compile_version();
+EXTERN_C const char* get_compile_version();
 
 #endif  // HW_VERSION_H_

main.cpp.tmpl

@@ -1,4 +1,5 @@
 #include "h.h"
+#include "hmain.h"
 #include "iniparser.h"
 
 typedef struct conf_ctx_s {