--- evlog-1.6.1/user/include/evl_template.h.orig	2011-06-08 13:50:00.000000000 -0400
+++ evlog-1.6.1/user/include/evl_template.h	2011-06-08 13:59:23.000000000 -0400
@@ -469,7 +469,7 @@
 extern void _evlTmplSemanticError(const char *fmt, ...);
 extern tmpl_type_info_t _evlTmplTypeInfo[];
 
-extern tmpl_arch_type_info_t _evlTmplArchTypeInfo[][];
+extern tmpl_arch_type_info_t _evlTmplArchTypeInfo[][24];
 
 extern void _evlTmplDprintf(const char *fmt, ...);
 extern int _evlEndsWith(const char *s, const char *suffix);
--- evlog-1.6.1/user/lib/template/tmplfmt.c.orig	2011-06-08 13:51:43.000000000 -0400
+++ evlog-1.6.1/user/lib/template/tmplfmt.c	2011-06-08 13:59:27.000000000 -0400
@@ -40,7 +40,7 @@
 
 #define dprintf _evlTmplDprintf
 
-extern tmpl_arch_type_info_t _evlTmplArchTypeInfo[7][24];
+extern tmpl_arch_type_info_t _evlTmplArchTypeInfo[][24];
 
 static int formatRecordFromTemplate(const template_t *template, evl_fmt_buf_t *f);
 
--- evlog-1.6.1/user/lib/template/convert.c.orig	2011-06-08 13:53:12.000000000 -0400
+++ evlog-1.6.1/user/lib/template/convert.c	2011-06-08 13:59:34.000000000 -0400
@@ -67,7 +67,7 @@
 	BE_64_32
 } conv_t;
 
-extern tmpl_arch_type_info_t _evlTmplArchTypeInfo[8][24];
+extern tmpl_arch_type_info_t _evlTmplArchTypeInfo[][24];
 /*
  * The first element of _evlTmplArchTypeInfo[0]... is always compiled
  * with local architecture, so it should contains local architecture
@@ -245,6 +245,7 @@
 			}
 			break;
     default:
+			break;
 	}
 }
 
--- evlog-1.6.1/user/lib/test/threadTest2.c.orig	2011-06-08 14:02:01.000000000 -0400
+++ evlog-1.6.1/user/lib/test/threadTest2.c	2011-06-08 14:07:52.000000000 -0400
@@ -24,7 +24,8 @@
  * (which in turn calls posix_log_vprintf).
  */
 
-#define MAX_THREADS (PTHREAD_THREADS_MAX-2)
+/* just make something arbitrary */
+#define MAX_THREADS 4094
 
 struct workerStats {
 	pthread_t	tid;
--- evlog-1.6.1/user/lib/test/threadTest.c.orig	2011-06-08 14:02:01.000000000 -0400
+++ evlog-1.6.1/user/lib/test/threadTest.c	2011-06-08 14:08:04.000000000 -0400
@@ -33,7 +33,8 @@
  * 
  */
 
-#define MAX_THREADS (PTHREAD_THREADS_MAX-2)
+/* just make something arbitrary */
+#define MAX_THREADS 4094
 
 struct workerStats {
 	pthread_t	tid;
--- evlog-1.6.1/user/lib/Makefile.in.orig	2011-06-08 14:12:36.000000000 -0400
+++ evlog-1.6.1/user/lib/Makefile.in	2011-06-08 14:12:38.000000000 -0400
@@ -269,7 +269,7 @@
 # bins or src products may be required to generate stuff in etc and or
 # doc. Stuff in bin, intl and lib may be required to generate stuff in
 # the rest (so, this is a possible dependency order).
-SUBDIRS = query template util . test
+SUBDIRS = query template util .
 all: all-recursive
 
 .SUFFIXES:
--- evlog-1.6.1/user/lib/util/format.c.orig	2011-06-08 14:01:04.000000000 -0400
+++ evlog-1.6.1/user/lib/util/format.c	2011-06-08 14:00:53.000000000 -0400
@@ -287,6 +287,7 @@
 		seg->u2.fs_attribute = NULL;
 		break;
   default:
+		break;
 	}
 	seg->fs_userfmt = attrFmt;
 	if (attrFmt
@@ -476,6 +477,7 @@
 			size += _evlGetMaxDumpLen();
 			break;
     default:
+		  break;
 		}
 		p = p->li_next;
 	} while (p != head);
@@ -668,6 +670,7 @@
 	case TY_LONG:		return TY_ULONG;
 	case TY_LONGLONG:	return TY_ULONGLONG;
   default:
+		break;
 	}
 	return ty;
 }