Index: /trunk/Makefile.in
===================================================================
--- /trunk/Makefile.in	(revision 291)
+++ /trunk/Makefile.in	(revision 292)
@@ -1751,5 +1751,5 @@
 dnmalloc.o: $(srcsrc)/dnmalloc.c Makefile config.h 
 t-test1.o: $(srcsrc)/t-test1.c Makefile config.h $(srcinc)/malloc.h 
-sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h 
+sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h 
 sh_log_parse_syslog.o: $(srcsrc)/sh_log_parse_syslog.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h 
 sh_log_parse_pacct.o: $(srcsrc)/sh_log_parse_pacct.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h 
Index: /trunk/configure.ac
===================================================================
--- /trunk/configure.ac	(revision 291)
+++ /trunk/configure.ac	(revision 292)
@@ -12,5 +12,5 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.7.2a)
+AM_INIT_AUTOMAKE(samhain, 2.7.2b)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST
Index: /trunk/depend.dep
===================================================================
--- /trunk/depend.dep	(revision 291)
+++ /trunk/depend.dep	(revision 292)
@@ -68,5 +68,5 @@
 dnmalloc-portable.o: $(srcsrc)/dnmalloc-portable.c Makefile config.h 
 dnmalloc.o: $(srcsrc)/dnmalloc.c Makefile config.h 
-sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h 
+sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h 
 sh_log_parse_syslog.o: $(srcsrc)/sh_log_parse_syslog.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h 
 sh_log_parse_pacct.o: $(srcsrc)/sh_log_parse_pacct.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h 
Index: /trunk/depend.sum
===================================================================
--- /trunk/depend.sum	(revision 291)
+++ /trunk/depend.sum	(revision 292)
@@ -1,1 +1,1 @@
-3512130170
+2431182974
Index: /trunk/docs/Changelog
===================================================================
--- /trunk/docs/Changelog	(revision 291)
+++ /trunk/docs/Changelog	(revision 292)
@@ -1,2 +1,5 @@
+2.7.2b:
+	* Fix compile errors on Solaris 10 (reported by A. Saheba)
+
 2.7.2a:
 	* rewrote rijndaelKeySched() in a more conservative way to fix
Index: /trunk/src/make-tests.sh
===================================================================
--- /trunk/src/make-tests.sh	(revision 291)
+++ /trunk/src/make-tests.sh	(revision 292)
@@ -18,8 +18,7 @@
 /* This is auto-generated code. Edit at your own peril. */
 
+#include "config.h"
 #include <stdio.h>
 #include "CuTest.h"
-#include "config.h"
-
 '
 
Index: /trunk/src/sh_log_parse_pacct.c
===================================================================
--- /trunk/src/sh_log_parse_pacct.c	(revision 291)
+++ /trunk/src/sh_log_parse_pacct.c	(revision 292)
@@ -116,6 +116,10 @@
   BIT(ACOMPAT, 'C');
 #endif
+#ifdef ACORE
   BIT(ACORE, 'D');
+#endif
+#ifdef AXSIG
   BIT(AXSIG, 'X');
+#endif
 
   out[i] = '\0';
Index: /trunk/src/sh_log_parse_samba.c
===================================================================
--- /trunk/src/sh_log_parse_samba.c	(revision 291)
+++ /trunk/src/sh_log_parse_samba.c	(revision 292)
@@ -17,4 +17,10 @@
 #include "config_xor.h"
 #include <string.h>
+
+#if defined(HOST_IS_SOLARIS)
+/* For 'struct timeval' in <sys/time.h> */
+#define __EXTENSIONS__
+#endif
+
 #include <time.h>
 
Index: /trunk/src/sh_log_parse_syslog.c
===================================================================
--- /trunk/src/sh_log_parse_syslog.c	(revision 291)
+++ /trunk/src/sh_log_parse_syslog.c	(revision 292)
@@ -20,4 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
+
+#if defined(HOST_IS_SOLARIS)
+/* For 'struct timeval' in <sys/time.h> */
+#define __EXTENSIONS__
+#endif
+
 #include <sys/types.h>
 #include <time.h>
Index: /trunk/src/sh_mem.c
===================================================================
--- /trunk/src/sh_mem.c	(revision 291)
+++ /trunk/src/sh_mem.c	(revision 292)
@@ -112,5 +112,5 @@
 #endif
 
-static void ** sh_mem_merr_1;
+static memlist_t ** sh_mem_merr_1;
 
 void sh_mem_stat ()
@@ -121,5 +121,5 @@
   SL_ENTER(_("sh_mem_stat"));
 
-  sh_mem_merr_1 = (void **) &merrlist;
+  sh_mem_merr_1 = (memlist_t **) &merrlist;
 
   if (Alloc_Count == Free_Count) 
@@ -166,5 +166,5 @@
 }
 
-static void ** sh_mem_merr_2;
+static memlist_t ** sh_mem_merr_2;
 
 void sh_mem_check ()
@@ -177,5 +177,5 @@
   SL_ENTER(_("sh_mem_check"));
 
-  sh_mem_merr_2 = (void **) &merrlist;
+  sh_mem_merr_2 = (memlist_t **) &merrlist;
 
   sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_MSTAMP,
@@ -317,5 +317,5 @@
 
 static void ** sh_mem_dummy_a;
-static void ** sh_mem_merr_3;
+static memlist_t ** sh_mem_merr_3;
 
 void sh_mem_free (void * aa, char * file, int line)
@@ -333,5 +333,5 @@
   a      = aa;
   sh_mem_dummy_a = &a;
-  sh_mem_merr_3  = (void **) &merrlist;
+  sh_mem_merr_3  = (memlist_t **) &merrlist;
 
 
Index: /trunk/src/sh_port2proc.c
===================================================================
--- /trunk/src/sh_port2proc.c	(revision 291)
+++ /trunk/src/sh_port2proc.c	(revision 292)
@@ -973,4 +973,7 @@
 #else /* !defined(__linux__) && !defined(__FreeBSD__) */
 
+#include "samhain.h"
+#include "sh_utils.h"
+
 char * sh_port2proc_query(int proto, struct in_addr * saddr, int sport,
 			  unsigned long * pid, char * user, size_t userlen)