diff --git a/lib/native/sunos-x86-64.jar b/lib/native/sunos-x86-64.jar
index 6716399ab6..58a4153160 100755
Binary files a/lib/native/sunos-x86-64.jar and b/lib/native/sunos-x86-64.jar differ
diff --git a/lib/native/sunos-x86.jar b/lib/native/sunos-x86.jar
index 6716399ab6..7d36803362 100755
Binary files a/lib/native/sunos-x86.jar and b/lib/native/sunos-x86.jar differ
diff --git a/native/dispatch.c b/native/dispatch.c
index 244a866372..427b775147 100644
--- a/native/dispatch.c
+++ b/native/dispatch.c
@@ -49,7 +49,7 @@
 #include <dlfcn.h>
 #include <errno.h>
 #define STRTYPE char*
-#ifdef __sparc__ // TODO: check solaris/x86
+#ifdef __sun__ // solaris sparc and x86/amd64 use default (file.encoding)
 #define NAME2CSTR(ENV,JSTR) newCString(ENV,JSTR)
 #else
 #define NAME2CSTR(ENV,JSTR) newCStringUTF8(ENV,JSTR)
diff --git a/native/dispatch.h b/native/dispatch.h
index e1146e4091..602b304e2c 100644
--- a/native/dispatch.h
+++ b/native/dispatch.h
@@ -18,7 +18,7 @@
 #include "ffi.h"
 #include "com_sun_jna_Function.h"
 #include "com_sun_jna_Native.h"
-#if defined(sun) || defined(_AIX)
+#if defined(__sun__) || defined(_AIX)
 #  include <alloca.h>
 #endif
 #ifdef _WIN32