Merge lp:~raff367/cuneiform-linux/main into lp:cuneiform-linux/0.6

[raff]

[raff (raff367)]

I have just made a few minor changes that allow Cuneiform to run on Cygwin. Basically all it needed to do is to treat Cygwin as WIN32 in all the places where there are checks for \n vs. \r
(changed #ifdef WIN32 to #if defined(WIN32) || defined(__CYGWIN__)

=== modified file 'cuneiform_src/Kern/cfcompat/cfcompat.c'
--- cuneiform_src/Kern/cfcompat/cfcompat.c	2009-07-20 15:38:28 +0000
+++ cuneiform_src/Kern/cfcompat/cfcompat.c	2009-08-19 13:35:30 +0000
@@ -269,9 +269,11 @@
     return 0;
 }
 
+#ifndef __CYGWIN__
 void strlwr(char *foo) {
     // FIXME: this is probably actually used somewhere.
 }
+#endif
 
 HWND CreateWindow(
     LPCTSTR lpClassName,

=== modified file 'cuneiform_src/Kern/include/cfcompat.h'
--- cuneiform_src/Kern/include/cfcompat.h	2009-06-02 09:17:20 +0000
+++ cuneiform_src/Kern/include/cfcompat.h	2009-08-19 13:35:30 +0000
@@ -108,7 +108,9 @@
 CFCOMPAT_FUNC(BOOL) EndPaint(HWND hWnd, ...);
 CFCOMPAT_FUNC(HDC) BeginPaint(HWND hwnd,...);
 CFCOMPAT_FUNC(LRESULT) SendMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
+#ifndef __CYGWIN__
 CFCOMPAT_FUNC(void) strlwr(char *foo);
+#endif
 CFCOMPAT_FUNC(HWND) CreateWindow(
     LPCTSTR lpClassName,
     LPCTSTR lpWindowName,

=== modified file 'cuneiform_src/Kern/rling/sources/c/rling_ma.c'
--- cuneiform_src/Kern/rling/sources/c/rling_ma.c	2009-01-21 14:52:06 +0000
+++ cuneiform_src/Kern/rling/sources/c/rling_ma.c	2009-08-19 13:35:30 +0000
@@ -400,7 +400,7 @@
 
 		/* MinGW file io seems to turn windows file endings into \n
                   so break -- no skip as when the \r is passed through */
-#ifdef WIN32
+#if defined(WIN32) || defined(__CYGWIN__)
                 if ( ch == '\n' ) {
                        break;
 		}

=== modified file 'cuneiform_src/Kern/rout/src/rout.cpp'
--- cuneiform_src/Kern/rout/src/rout.cpp	2008-09-18 11:46:37 +0000
+++ cuneiform_src/Kern/rout/src/rout.cpp	2009-08-19 13:35:30 +0000
@@ -973,7 +973,7 @@
 	FILE *f = NULL;
 	int fd;
 	char buf[256] = "";
-#ifdef WIN32
+#if defined(WIN32) || defined(__CYGWIN__)
 	const char line_end = '\n';
 #else
 	const char line_end = '\r';

=== modified file 'cuneiform_src/Kern/rout/src/rout_own.h'
--- cuneiform_src/Kern/rout/src/rout_own.h	2009-02-02 17:08:58 +0000
+++ cuneiform_src/Kern/rout/src/rout_own.h	2009-08-19 13:35:30 +0000
@@ -196,7 +196,7 @@
 EXTERN BOOL langKaz		VAL(FALSE);
 
 // Êîíåö ñòðîêè
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__CYGWIN__)
 EXTERN char gEOL[4]		VAL2(0x0d,0x0a);
 #else
 EXTERN char gEOL[4]             VAL2(0x0a, 0x00);

=== modified file 'cuneiform_src/Kern/rselstr/sources/src/chstr/cutstr/chstr_cutstr.cpp'
--- cuneiform_src/Kern/rselstr/sources/src/chstr/cutstr/chstr_cutstr.cpp	2009-02-02 17:08:58 +0000
+++ cuneiform_src/Kern/rselstr/sources/src/chstr/cutstr/chstr_cutstr.cpp	2009-08-19 13:35:30 +0000
@@ -711,6 +711,12 @@
 			 // äëÿ DebugBreakEx() (ñì. íèæå);
 			 // ñóùåñòâóåò òîëüêî â Windows ñòàðøå W98 (W98 ãîäèòñÿ)
 			 // èëè ñòàðøå NT 4.0 (NT 4.0 ãîäèòñÿ)
+			 #ifndef WINBASEAPI
+			 #define WINBASEAPI
+			 #endif
+			 #ifndef VOID
+			 #define VOID
+			 #endif
 			 extern "C" {
 			 WINBASEAPI BOOL WINAPI IsDebuggerPresent(VOID);
 			 }

=== modified file 'cuneiform_src/Kern/std/src/_prt.h'
--- cuneiform_src/Kern/std/src/_prt.h	2008-09-04 09:14:35 +0000
+++ cuneiform_src/Kern/std/src/_prt.h	2009-08-19 13:35:30 +0000
@@ -60,6 +60,9 @@
 #include <string>
 #include <list>
 #include <vector>
+#ifdef __CYGWIN__
+#include <stdarg.h>
+#endif
 #include "stdprt.h"
 #include "xstack.h"
 #include "xpath.h"