Upgraded to trio baseline 1.6
diff --git a/trio.h b/trio.h
index 14f2f52..5a38f4a 100644
--- a/trio.h
+++ b/trio.h
@@ -13,6 +13,10 @@
* MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
* CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
*
+ *************************************************************************
+ *
+ * http://ctrio.sourceforge.net/
+ *
************************************************************************/
#ifndef TRIO_TRIO_H
@@ -41,6 +45,11 @@
# define isascii ((unsigned)(x) < 0x80)
#endif
+/* Error macros */
+#define TRIO_ERROR_CODE(x) ((-(x)) & 0x00FF)
+#define TRIO_ERROR_POSITION(x) ((-(x)) >> 8)
+#define TRIO_ERROR_NAME(x) trio_strerror(x)
+
/*
* Error codes.
*
@@ -53,14 +62,10 @@
TRIO_EDBLREF = 4,
TRIO_EGAP = 5,
TRIO_ENOMEM = 6,
- TRIO_ERANGE = 7
+ TRIO_ERANGE = 7,
+ TRIO_ERRNO = 8
};
-/* Error macros */
-#define TRIO_ERROR_CODE(x) ((-(x)) & 0x00FF)
-#define TRIO_ERROR_POSITION(x) ((-(x)) >> 8)
-#define TRIO_ERROR_NAME(x) trio_strerror(x)
-
const char *trio_strerror(int);
/*************************************************************************
@@ -183,13 +188,6 @@
#define vdscanf trio_vdscanf
#endif
-/* strio compatible names */
-#define StrScan trio_sscanf
-#define StrFormat trio_sprintf
-#define StrFormatMax trio_snprintf
-#define StrFormatAlloc trio_aprintf
-#define StrFormatAppendMax trio_snprintfcat
-
#ifdef __cplusplus
} /* extern "C" */
#endif