Added a win32 config header

4 files changed, 136 insertions, 5 deletions

diff --git a/Makefile.am b/Makefile.am
index 514f7a0..a1b0af6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-EXTRA_DIST = BUGS test-files
+EXTRA_DIST = BUGS test-files config.win32.h
 SUBDIRS = src win32
 
 dist-hook:
diff --git a/config.win32.h b/config.win32.h
new file mode 100644
index 0000000..8fbdf95
--- /dev/null
+++ b/config.win32.h
@@ -0,0 +1,127 @@
+/* config.h.  Generated by configure.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define to 1 if using `alloca.c'. */
+/* #undef C_ALLOCA */
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the <exception> header file. */
+#define HAVE_EXCEPTION 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the <sablot.h> header file. */
+#define HAVE_SABLOT_H 1
+
+/* Define to 1 if you have the <sdom.h> header file. */
+#define HAVE_SDOM_H 1
+
+/* Define to 1 if you have the `sprintf' function. */
+#define HAVE_SPRINTF 1
+
+/* Define to 1 if you have the <stack> header file. */
+#define HAVE_STACK 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the <string> header file. */
+#define HAVE_STRING 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+/* #undef HAVE_SYS_STAT_H */
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+/* #undef HAVE_UNISTD_H */
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to 1 if the system has the type `wstring'. */
+#define HAVE_WSTRING 1
+
+/* Name of package */
+#define PACKAGE "rtfx"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "nielsen@memberwebs.com"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "rtfx"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "rtfx 0.9.1"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "rtfx"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.9.1"
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
+/* #undef STACK_DIRECTION */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "0.9.1"
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
diff --git a/src/usuals.h b/src/usuals.h
index 8a58660..c9843b0 100644
--- a/src/usuals.h
+++ b/src/usuals.h
@@ -42,7 +42,11 @@
 #define NULL 0
 #endif
 
+#ifdef _WIN32
+#include "config.win32.h"
+#else
 #include "config.h"
+#endif
 
 #include <stdlib.h>
 #include <assert.h>
diff --git a/win32/rtfx.dsp b/win32/rtfx.dsp
index fabaf9d..f19e662 100644
--- a/win32/rtfx.dsp
+++ b/win32/rtfx.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "sablot/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "sablot/include" /I "../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -102,15 +102,15 @@ SOURCE=..\src\rtfanalyser.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\rtfx.cpp
+SOURCE=..\src\rtfparsehelpers.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\rtfparsehelpers.cpp
+SOURCE=..\src\rtfreader.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\rtfreader.cpp
+SOURCE=..\src\rtfx.cpp
 # End Source File
 # Begin Source File