Changeset 156 for trunk/include

Timestamp:

Jan 13, 2008, 7:25:06 PM (17 years ago)

Author:

katerina

Message:

Put result vector of rng in skey struct, fix HP-UX compile error.

Location:

trunk/include

Files:

• samhain.h (modified) (4 diffs)
• sh_unix.h (modified) (1 diff)
• slib.h (modified) (1 diff)

trunk/include/samhain.h

@@ -98 +98 @@
 #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 +111 @@
 #define  UINT64 unsigned long
 #else
-#define UINT64_IS_32
-#define  UINT64 unsigned long
+#error "no 64bit type found"
 #endif
 #endif
@@ -135 +133 @@
 #define SH_MOD_ACTIVE  0
 #define SH_MOD_FAILED -1
- 
+
 /* Flags for file status
  */
@@ -325 +323 @@
   UINT32 rng2[3];
 
+  UINT32 res_vec[6];
+
   UINT32 ErrFlag[2];
 

trunk/include/sh_unix.h

@@ -23 +23 @@
 #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"

trunk/include/slib.h

@@ -68 +68 @@
 #define SL_GNUC_CONST   __attribute__((const))
 #else
-#undef  SH_GNUC_CONST
-#define SH_GNUC_CONST
+#undef  SL_GNUC_CONST
+#define SL_GNUC_CONST
 #endif