Index: trunk/include/samhain.h
===================================================================
--- trunk/include/samhain.h	(revision 151)
+++ trunk/include/samhain.h	(revision 156)
@@ -98,11 +98,10 @@
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
-#else
+#endif
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
-#endif
-
-#if !defined(HAVE_INTTYPES_H) && !defined(HAVE_STDINT_H)
+
+#if !defined(HAVE_UINT64_T)
 
 #ifdef HAVE_LONG_LONG_64
@@ -112,6 +111,5 @@
 #define  UINT64 unsigned long
 #else
-#define UINT64_IS_32
-#define  UINT64 unsigned long
+#error "no 64bit type found"
 #endif
 #endif
@@ -135,5 +133,5 @@
 #define SH_MOD_ACTIVE  0
 #define SH_MOD_FAILED -1
- 
+
 /* Flags for file status
  */
@@ -325,4 +323,6 @@
   UINT32 rng2[3];
 
+  UINT32 res_vec[6];
+
   UINT32 ErrFlag[2];
 
Index: trunk/include/sh_unix.h
===================================================================
--- trunk/include/sh_unix.h	(revision 151)
+++ trunk/include/sh_unix.h	(revision 156)
@@ -23,5 +23,10 @@
 #define SH_UNIX_H
 
+/* For PATH_MAX */
 #include <limits.h>
+#if !defined(PATH_MAX)
+#define PATH_MAX 1024
+#endif
+
 #include <unistd.h>
 #include "samhain.h"
Index: trunk/include/slib.h
===================================================================
--- trunk/include/slib.h	(revision 151)
+++ trunk/include/slib.h	(revision 156)
@@ -68,6 +68,6 @@
 #define SL_GNUC_CONST   __attribute__((const))
 #else
-#undef  SH_GNUC_CONST
-#define SH_GNUC_CONST
+#undef  SL_GNUC_CONST
+#define SL_GNUC_CONST
 #endif