From 30b60c7dc4b31d2f61b7129778fa626ec24b930c Mon Sep 17 00:00:00 2001
From: Ende! <ende1337@gmail.com>
Date: Mon, 16 Mar 2015 14:32:27 +0100
Subject: [PATCH] fixed build with clang

---
 Bindings/C/VXInstructionDecoderC.c   |  6 ++----
 Bindings/C/VXInstructionFormatterC.c | 10 +++++-----
 Bindings/C/VXInternalConfig.h        |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Bindings/C/VXInstructionDecoderC.c b/Bindings/C/VXInstructionDecoderC.c
index 3d44a4d..7b2f675 100644
--- a/Bindings/C/VXInstructionDecoderC.c
+++ b/Bindings/C/VXInstructionDecoderC.c
@@ -187,7 +187,7 @@ uint8_t VXBaseDataSource_InputPeek(VXBaseDataSourceContext *ctx, VXInstructionIn
     return thiz->currentInput;
 }
 
-static uint8_t VXBaseDataSource_InputNext8(VXBaseDataSourceContext *ctx, VXInstructionInfo *info)
+uint8_t VXBaseDataSource_InputNext8(VXBaseDataSourceContext *ctx, VXInstructionInfo *info)
 {
     VXBaseDataSource *thiz = VXBaseDataSource_thiz(ctx);
 
@@ -208,7 +208,7 @@ static uint8_t VXBaseDataSource_InputNext8(VXBaseDataSourceContext *ctx, VXInstr
 }
 
 #define VXBASEDATASOURCE_INPUTNEXT_N(n)                                                           \
-    static uint##n##_t VXBaseDataSource_InputNext##n(                                             \
+    uint##n##_t VXBaseDataSource_InputNext##n(                                                    \
         VXBaseDataSourceContext *ctx, VXInstructionInfo *info)                                    \
     {                                                                                             \
         uint##n##_t result = 0;                                                                   \
@@ -274,8 +274,6 @@ void VXMemoryDataSource_Construct(
 
 void VXMemoryDataSource_Destruct(VXBaseDataSourceContext *ctx)
 {
-    VXMemoryDataSource *thiz = VXMemoryDataSource_thiz(ctx);
-
     // Nothing to destruct ourselfes, just call parent destructor
     VXBaseDataSource_Destruct(ctx);
 }
diff --git a/Bindings/C/VXInstructionFormatterC.c b/Bindings/C/VXInstructionFormatterC.c
index 9403aa6..9af2ecb 100644
--- a/Bindings/C/VXInstructionFormatterC.c
+++ b/Bindings/C/VXInstructionFormatterC.c
@@ -85,7 +85,7 @@ typedef struct _VXBaseInstructionFormatter
 static void VXBaseInstructionFormatter_Construct(VXBaseInstructionFormatterContext *ctx, VXBaseSymbolResolverContext *symbolResolver);
 static void VXBaseInstructionFormatter_Destruct(VXBaseInstructionFormatterContext *ctx);
 void VXBaseInstructionFormatter_Release(VXBaseInstructionFormatterContext *ctx);
-static void VXBaseInstructionFormatter_OutputSetUppercase(VXBaseInstructionFormatterContext *ctx, bool uppercase);
+/*static void VXBaseInstructionFormatter_OutputSetUppercase(VXBaseInstructionFormatterContext *ctx, bool uppercase);*/
 static char const* VXBaseInstructionFormatter_RegisterToString(const VXBaseInstructionFormatterContext *ctx, VXRegister reg);
 static char const* VXBaseInstructionFormatter_ResolveSymbol(const VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, uint64_t address, uint64_t *offset);
 VXBaseSymbolResolverContext* VXBaseInstructionFormatter_GetSymbolResolver(const VXBaseInstructionFormatterContext *ctx);
@@ -202,6 +202,8 @@ VXBaseSymbolResolverContext* VXCustomSymbolResolver_Create(
 
     ctx->d.type = TYPE_CUSTOMSYMBOLRESOLVER;
     ctx->d.ptr  = thiz;
+    
+    VXCustomSymbolResolver_Construct(ctx, resolverCb, userData);
 
     return ctx;
 }
@@ -313,11 +315,13 @@ void VXBaseInstructionFormatter_Release(
     free(ctx);
 }
 
+/*
 static void VXBaseInstructionFormatter_OutputSetUppercase(VXBaseInstructionFormatterContext *ctx,
     bool uppercase)
 {
     VXBaseInstructionFormatter_thiz(ctx)->outputUppercase = uppercase;
 }
+*/
 
 static char const* VXBaseInstructionFormatter_RegisterToString(
     const VXBaseInstructionFormatterContext *ctx, VXRegister reg) 
@@ -530,8 +534,6 @@ static void VXBaseInstructionFormatter_OutputAppendImmediate(
     const VXOperandInfo *operand, 
     bool resolveSymbols)
 {
-    VXBaseInstructionFormatter *thiz = VXBaseInstructionFormatter_thiz(ctx);
-
     assert(operand->type == OPTYPE_IMMEDIATE);
     uint64_t value = 0;
     if (operand->signed_lval && (operand->size != info->operand_mode)) 
@@ -600,8 +602,6 @@ static void VXBaseInstructionFormatter_OutputAppendDisplacement(
     VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, 
     const VXOperandInfo *operand)
 {
-    VXBaseInstructionFormatter *thiz = VXBaseInstructionFormatter_thiz(ctx);
-
     assert(operand->offset > 0);
     if ((operand->base == REG_NONE) && (operand->index == REG_NONE))
     {
diff --git a/Bindings/C/VXInternalConfig.h b/Bindings/C/VXInternalConfig.h
index 9ef7753..260f008 100644
--- a/Bindings/C/VXInternalConfig.h
+++ b/Bindings/C/VXInternalConfig.h
@@ -36,7 +36,7 @@
 #ifdef _MSC_VER
 #   define VX_INLINE __inline
 #else
-#   define VX_INLINE inline
+#   define VX_INLINE extern inline
 #endif
 
 #define VX_EXPORT