Remove uchar.h includes

Author: GoGoOtaku

lib/libpe/include/libpe/dir_resources.h

@@ -23,8 +23,6 @@
 #define LIBPE_DIR_RESOURCES_H
 
 #include <stdint.h>
-#include <uchar.h>
-#include <wchar.h>
 
 #ifdef __cplusplus
 extern "C" {

lib/libpe/resources.c

@@ -30,7 +30,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <uchar.h>
 #include <unistd.h>
 
 // REFERENCE: https://msdn.microsoft.com/en-us/library/ms648009(v=vs.85).aspx
@@ -637,7 +636,7 @@ const VS_FIXEDFILEINFO *pe_resource_get_fixedfileinfo(const pe_ctx_t *ctx, const
                 break;
             }
 
-            const char16_t *szkey = LIBPE_PTR_ADD(data_ptr, sizeof(VS_VERSIONINFO_HEAD));
+            const uint16_t *szkey = LIBPE_PTR_ADD(data_ptr, sizeof(VS_VERSIONINFO_HEAD));
 
             // char key[256];
             // mbstate_t state = {0};
@@ -653,7 +652,7 @@ const VS_FIXEDFILEINFO *pe_resource_get_fixedfileinfo(const pe_ctx_t *ctx, const
             }
             // printf("\n%s\n", key);
 
-            int info_offset = (key_size*sizeof(char16_t)) + sizeof(VS_VERSIONINFO_HEAD);
+            int info_offset = (key_size*sizeof(uint16_t)) + sizeof(VS_VERSIONINFO_HEAD);
             // Align to next 32bit/4byte
             info_offset += 4-(info_offset%4);
 

src/peres.c

@@ -41,7 +41,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <uchar.h>
 #include <unistd.h>
 #include <wchar.h>
 

src/pestr.c

@@ -36,6 +36,7 @@
 
 #include "common.h"
 #include <ctype.h>
+#include <wchar.h>
 #include <wctype.h>
 #include <errno.h>
 #include <limits.h>