trio upgrade and integration
diff --git a/strio.h b/strio.h
index a31eae4..2a1da36 100644
--- a/strio.h
+++ b/strio.h
@@ -15,13 +15,16 @@
  *
  ************************************************************************/
 
-#ifndef H_STRIO
-#define H_STRIO
+#ifndef TRIO_STRIO_H
+#define TRIO_STRIO_H
 
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "assert.h"
+#ifndef DEBUG
+# define NDEBUG
+#endif
+#include <assert.h>
 
 /*
  * StrAppend(target, source)
@@ -122,7 +125,7 @@
 enum {
   STRIO_HASH_NONE = 0,
   STRIO_HASH_PLAIN,
-  STRIO_HASH_TWOSIGNED
+  STRIO_HASH_TWOSIGNED,
 };
 
 #if !defined(DEBUG) || defined(__DECC)
@@ -213,4 +216,4 @@
 double StrToDouble(const char *source, const char **target);
 int StrToUpper(char *target);
 
-#endif /* H_STRIO */
+#endif /* TRIO_STRIO_H */