truncsp() and truncnl() are now part of genwrap.c (since STRERROR needs

truncsp() on Win32 anyway).

src/xpdev/dat_file.c

@@ -41,8 +41,6 @@
 #include <stdlib.h>		/* malloc */
 #include <string.h>		/* strdup */
 
-#include "truncsp.c"	/* truncsp() and truncnl() */
-
 /***********************************/
 /* CSV (Comma Separated Value) API */
 /***********************************/

src/xpdev/genwrap.c

@@ -416,3 +416,31 @@ clock_t DLLCALL msclock(void)
 	return((clock_t)(usecs/(1000000/MSCLOCKS_PER_SEC)));
 }
 #endif
+
+/****************************************************************************/
+/* Truncates all white-space chars off end of 'str'	(needed by STRERRROR)	*/
+/****************************************************************************/
+char* DLLCALL truncsp(char* str)
+{
+	unsigned c;
+
+	c=strlen(str);
+	while(c && (str[c-1]==' ' || str[c-1]=='\t' || str[c-1]=='\r' || str[c-1]=='\n')) c--;
+	str[c]=0;
+
+	return(str);
+}
+
+/****************************************************************************/
+/* Truncates carriage-return and line-feed chars off end of 'str'			*/
+/****************************************************************************/
+char* DLLCALL truncnl(char* str)
+{
+	unsigned c;
+
+	c=strlen(str);
+	while(c && (str[c-1]=='\r' || str[c-1]=='\n')) c--;
+	str[c]=0;
+
+	return(str);
+}

src/xpdev/genwrap.h

@@ -171,6 +171,11 @@ extern "C" {
 	#endif
 #endif
 
+/* Truncate white-space chars off end of string */
+DLLEXPORT char*		DLLCALL truncsp(char* str);
+/* Truncate new-line chars off end of string */
+DLLEXPORT char*		DLLCALL truncnl(char* str);
+
 #if defined(__unix__)
 	#define STRERROR(x)		strerror(x)
 #else

src/xpdev/ini_file.c

@@ -54,8 +54,6 @@
 
 static ini_style_t default_style;
 
-#include "truncsp.c"	/* truncsp() and truncnl() */
-
 static char* section_name(char* p)
 {
 	char*	tp;