Merge branch 'ftbfs-ppc' of https://github.com/Debian/nqp

Raku · May 4, 2013 · 249b9cf · 249b9cf
2 parents e3b8ef2 + e3a67e4
commit 249b9cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/3rdparty/dyncall/dyncallback/dyncall_callback_ppc32.c b/3rdparty/dyncall/dyncallback/dyncall_callback_ppc32.c
@@ -25,6 +25,7 @@
 
 #include "dyncall_callback.h"
 #include "dyncall_callback_ppc32.h"
+#include "dyncall_alloc_wx.h"
 
 void dcbInitCallback(DCCallback* pcb, const char* signature, DCCallbackHandler* handler, void* userdata)
 {

diff --git a/3rdparty/dyncall/dyncallback/dyncall_thunk_ppc32.c b/3rdparty/dyncall/dyncallback/dyncall_thunk_ppc32.c
@@ -25,8 +25,8 @@
 
 #include "dyncall_thunk.h"
 
-unsigned short hi16(x) { return ( (unsigned short) (((unsigned int)x)>>16UL) ); }
-unsigned short lo16(x) { return ( (unsigned short)  ((unsigned int)x)        ); }   
+unsigned short hi16(unsigned int x) { return ( (unsigned short) (((unsigned int)x)>>16UL) ); }
+unsigned short lo16(unsigned int x) { return ( (unsigned short)  ((unsigned int)x)        ); }   
 
 void dcbInitThunk(DCThunk* p, void (*entry)())
 {