[rkward-cvs] SF.net SVN: rkward-code:[4715] trunk/rkward/rkward/rbackend

[tfry at users.sf.net]

Revision: 4715
          http://sourceforge.net/p/rkward/code/4715
Author:   tfry
Date:     2013-04-24 16:18:57 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
Windows compilation fixes

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rkrbackend.cpp
    trunk/rkward/rkward/rbackend/rkreventloop.cpp

Modified: trunk/rkward/rkward/rbackend/rkrbackend.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rkrbackend.cpp	2013-04-23 17:58:59 UTC (rev 4714)
+++ trunk/rkward/rkward/rbackend/rkrbackend.cpp	2013-04-24 16:18:57 UTC (rev 4715)
@@ -18,8 +18,8 @@
 #include "rkrbackend.h"
 
 #ifdef Q_WS_WIN
+#	include <winsock2.h>
 #	include <windows.h>
-#	include <winsock2.h>
 #	include <locale.h>
 #	undef ERROR 	// clashes with R
 #	define Win32	// needed for R includes

Modified: trunk/rkward/rkward/rbackend/rkreventloop.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rkreventloop.cpp	2013-04-23 17:58:59 UTC (rev 4714)
+++ trunk/rkward/rkward/rbackend/rkreventloop.cpp	2013-04-24 16:18:57 UTC (rev 4715)
@@ -17,7 +17,11 @@
 
 #include "rkreventloop.h"
 
-#include <R_ext/eventloop.h>
+#ifdef Q_OS_WIN
+#	include <R.h>
+#else
+#	include <R_ext/eventloop.h>
+#endif
 #include <Rinternals.h>
 
 #include "rkrbackend.h"