Upgraded to trio baseline 1.6
diff --git a/triodef.h b/triodef.h
index a3ca8b6..3e12cc4 100644
--- a/triodef.h
+++ b/triodef.h
@@ -15,8 +15,8 @@
*
************************************************************************/
-#ifndef __TRIO_TRIODEF_H__
-#define __TRIO_TRIODEF_H__
+#ifndef TRIO_TRIODEF_H
+#define TRIO_TRIODEF_H
/*************************************************************************
* Platform and compiler support detection
@@ -48,12 +48,17 @@
# define TRIO_PLATFORM_UNIX
#elif defined(__QNX__)
# define TRIO_PLATFORM_UNIX
+# define TRIO_PLATFORM_QNX
#elif defined(__CYGWIN__)
# define TRIO_PLATFORM_UNIX
#elif defined(AMIGA) && defined(TRIO_COMPILER_GCC)
# define TRIO_PLATFORM_UNIX
#elif defined(TRIO_COMPILER_MSVC) || defined(WIN32) || defined(_WIN32)
# define TRIO_PLATFORM_WIN32
+#elif defined(VMS) || defined(__VMS)
+# define TRIO_PLATFORM_VMS
+#elif defined(mpeix) || defined(__mpexl)
+# define TRIO_PLATFORM_MPEIX
#endif
#if defined(__STDC__)
@@ -81,4 +86,35 @@
# endif
#endif
-#endif /* __TRIO_TRIODEF_H__ */
+/*************************************************************************
+ * Generic defines
+ */
+
+#if !defined(TRIO_PUBLIC)
+# define TRIO_PUBLIC
+#endif
+#if !defined(TRIO_PRIVATE)
+# define TRIO_PRIVATE static
+#endif
+
+#if defined(TRIO_COMPILER_SUPPORTS_C90) || defined(__cplusplus)
+# define TRIO_CONST const
+# define TRIO_VOLATILE volatile
+# define TRIO_POINTER void *
+# define TRIO_PROTO(x) x
+#else
+# define TRIO_CONST
+# define TRIO_VOLATILE
+# define TRIO_POINTER char *
+# define TRIO_PROTO(x) ()
+#endif
+
+#if defined(TRIO_COMPILER_SUPPORTS_C99) || defined(__cplusplus)
+# define TRIO_INLINE inline
+#elif defined(TRIO_COMPILER_GCC)
+# define TRIO_INLINE __inline__
+#else
+# define TRIO_INLINE
+#endif
+
+#endif /* TRIO_TRIODEF_H */