Applied patch for compiling Ragel using MSVC from Andrei Polushin.

Changed WIN32 -> _WIN32.

git-svn-id: http://svn.complang.org/ragel/trunk@435 052ea7fc-9027-0410-9066-f65837a77df0

diff --git a/ragel/main.cpp b/ragel/main.cpp
index 6d0303f..f8c6fc6 100644 (file)
--- a/ragel/main.cpp
+++ b/ragel/main.cpp
@@ -32,11 +32,19 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <sys/wait.h>
 #else
 #include <windows.h>
 #include <psapi.h>
+#include <time.h>
+#include <io.h>
+#include <process.h>
+
+#if _MSC_VER
+#define S_IRUSR _S_IREAD
+#define S_IWUSR _S_IWRITE
+#endif
 #endif
 
 /* Parsing. */
@@ -547,7 +555,7 @@ void cleanExit( char *intermed, int status )
        exit( status );
 }
 
-#ifndef WIN32
+#ifndef _WIN32
 
 /* If any forward slash is found in argv0 then it is assumed that the path is
  * explicit and the path to the backend executable should be derived from
@@ -701,7 +709,7 @@ void execFrontend( const char *argv0, char *inputFileName, char *intermed )
        frontendArgs.append( inputFileName );
        frontendArgs.append( 0 );
 
-#ifndef WIN32
+#ifndef _WIN32
        char **pathChecks = makePathChecksUnix( argv0, progName );
        forkAndExec( progName, pathChecks, frontendArgs, intermed );
 #else
@@ -741,7 +749,7 @@ void execBackend( const char *argv0, char *intermed, char *outputFileName )
        backendArgs.append( intermed );
        backendArgs.append( 0 );
 
-#ifndef WIN32
+#ifndef _WIN32
        char **pathChecks = makePathChecksUnix( argv0, progName );
        forkAndExec( progName, pathChecks, backendArgs, intermed );
 #else

diff --git a/ragel/rlscan.rl b/ragel/rlscan.rl
index 341cb8b..bf4cd92 100644 (file)
--- a/ragel/rlscan.rl
+++ b/ragel/rlscan.rl
@@ -41,7 +41,7 @@ enum InlineBlockType
        SemiTerminated
 };
 
-#ifdef WIN32
+#ifdef _WIN32
 #define PATH_SEP '\\'
 #else
 #define PATH_SEP '/'
@@ -546,7 +546,7 @@ void Scanner::endSection( )
 
 bool isAbsolutePath( const char *path )
 {
-#ifdef WIN32
+#ifdef _WIN32
        return isalpha( path[0] ) && path[1] == ':' && path[2] == '\\';
 #else
        return path[0] == '/';