[Libwpd-cvs] libwpd2/src/lib Makefile.am, 1.115, 1.116 WPXString.cpp, 1.21, 1.22 libwpd_types.h, 1.5, 1.6 vsnprintf.c, 1.1, NONE

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpd/libwpd2/src/lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17419/src/lib

Modified Files:
	Makefile.am WPXString.cpp libwpd_types.h 
Removed Files:
	vsnprintf.c 
Log Message:
removing workarounds for bugs fixed in the djgpp 2.04 beta

--- vsnprintf.c DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/lib/Makefile.am,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- Makefile.am	3 Sep 2009 08:00:52 -0000	1.115
+++ Makefile.am	5 Sep 2009 13:40:11 -0000	1.116
@@ -440,7 +440,6 @@
 	$(libwpd_stream_sources) \
 	$(libwpd_stream_headers) \
 	makefile.mk \
-	vsnprintf.c \
 	libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.def \
 	libwpd.h.in \
 	libwpd.rc.in \

Index: WPXString.cpp
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXString.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- WPXString.cpp	3 Sep 2009 08:00:54 -0000	1.21
+++ WPXString.cpp	5 Sep 2009 13:40:11 -0000	1.22
@@ -31,12 +31,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#ifdef __DJGPP__
-namespace {
-#include "vsnprintf.c"
-}
-#endif
-
 #define FIRST_BUF_SIZE 128
 #ifdef _MSC_VER
 #define vsnprintf _vsnprintf

Index: libwpd_types.h
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_types.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libwpd_types.h	3 Sep 2009 08:00:54 -0000	1.5
+++ libwpd_types.h	5 Sep 2009 13:40:11 -0000	1.6
@@ -25,7 +25,7 @@
 #ifndef LIBWPD_TYPES_H
 #define LIBWPD_TYPES_H
 
-#if defined(_MSC_VER) || defined (__DJGPP__)
+#if defined(_MSC_VER)
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
 typedef signed short int16_t;