@@ -376,11 +376,11 @@
 
 #if defined(__amd64)
 #define test_sse_hw     1
 #else
 extern int _sse_hw;
-#define test_sse_hw     &_sse_hw && _sse_hw
+#define test_sse_hw     _sse_hw
 #endif
 
 #if !defined(REG_PC)
 #define REG_PC  EIP
 #endif

@@ -392,11 +392,11 @@
 static void
 __fex_hdlr(int sig, siginfo_t *sip, ucontext_t *uap)
 {
         struct fex_handler_data *thr_handlers;
         struct sigaction        act;
-        void                    (*handler)(), (*simd_handler[4])();
+        void                    (*handler)() = NULL, (*simd_handler[4])();
         int                     mode, simd_mode[4], i, len, accrued, *ap;
         unsigned int            cwsw, oldcwsw, mxcsr, oldmxcsr;
         enum fex_exception      e, simd_e[4];
         fex_info_t              info, simd_info[4];
         unsigned long           addr;