[fyba] 23/77: Fixes for build on windows posible conflicting with linux-build

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository fyba.

commit cd7e7d2e7cff39ec13915429de237ebb124a6de3
Author: ninsbl <ninsbl at NINAPC035.nina.no>
Date:   Mon Oct 21 22:41:31 2013 +0200

    Fixes for build on windows posible conflicting with linux-build
---
 include/fyba.h  | 4 ++--
 include/fyut.h  | 8 ++++++--
 src/FYBA/fyba.h | 4 ++--
 src/GM/GM.cpp   | 2 +-
 src/UT/fyut.h   | 8 ++++++--
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/include/fyba.h b/include/fyba.h
index c75f19e..6ac9415 100644
--- a/include/fyba.h
+++ b/include/fyba.h
@@ -85,8 +85,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <fygm.h>
-#include <fyut.h>
+#include "..\GM\fygm.h"
+#include "..\UT\fyut.h"
 
 
 /* ======================================================= */
diff --git a/include/fyut.h b/include/fyut.h
index e7f7f77..abd515e 100644
--- a/include/fyut.h
+++ b/include/fyut.h
@@ -78,8 +78,12 @@
 #  define _FILE_OFFSET_BITS 64
 #  include <limits.h>
 #  include <sys/types.h>
-#  include <unistd.h>
-#  include <stdio.h>
+
+#  ifdef WIN32
+#    include <io.h>
+#  else
+#    include <unistd.h>
+#  endif
 
 #  define _TRUNCATE 0
 #  define _fseeki64 fseek
diff --git a/src/FYBA/fyba.h b/src/FYBA/fyba.h
index c75f19e..6ac9415 100644
--- a/src/FYBA/fyba.h
+++ b/src/FYBA/fyba.h
@@ -85,8 +85,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <fygm.h>
-#include <fyut.h>
+#include "..\GM\fygm.h"
+#include "..\UT\fyut.h"
 
 
 /* ======================================================= */
diff --git a/src/GM/GM.cpp b/src/GM/GM.cpp
index 0888fd4..fabb976 100644
--- a/src/GM/GM.cpp
+++ b/src/GM/GM.cpp
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <memory.h>
 
-#include <../UT/fyut.h>
+#include "../UT/fyut.h"
 
 #include "fygm.h"
 
diff --git a/src/UT/fyut.h b/src/UT/fyut.h
index e7f7f77..abd515e 100644
--- a/src/UT/fyut.h
+++ b/src/UT/fyut.h
@@ -78,8 +78,12 @@
 #  define _FILE_OFFSET_BITS 64
 #  include <limits.h>
 #  include <sys/types.h>
-#  include <unistd.h>
-#  include <stdio.h>
+
+#  ifdef WIN32
+#    include <io.h>
+#  else
+#    include <unistd.h>
+#  endif
 
 #  define _TRUNCATE 0
 #  define _fseeki64 fseek

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/fyba.git