From fa25d7cf7b31f8884e46aef8a45721e97166860d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 2 May 2014 00:54:42 +1000
Subject: Code cleanup: remove defines no longer needed on windows

---
 source/blender/blenkernel/intern/blender.c    | 4 ----
 source/blender/blenkernel/intern/image.c      | 5 -----
 source/blender/blenkernel/intern/movieclip.c  | 5 -----
 source/blender/blenkernel/intern/packedFile.c | 8 --------
 source/blender/imbuf/intern/readimage.c       | 3 ---
 source/blender/imbuf/intern/util.c            | 3 ---
 6 files changed, 28 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 468d39709d7..3d323db2623 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -38,10 +38,6 @@
 #  include <unistd.h> // for read close
 #else
 #  include <io.h> // for open close read
-#  define open _open
-#  define read _read
-#  define close _close
-#  define write _write
 #endif
 
 #include <stdlib.h>
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index dec890c4b68..440320e98fe 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -40,11 +40,6 @@
 
 #include <time.h>
 
-#ifdef _WIN32
-#  define open _open
-#  define close _close
-#endif
-
 #include "MEM_guardedalloc.h"
 
 #include "IMB_colormanagement.h"
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index a69d8d3ee7e..35bf453c328 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -41,11 +41,6 @@
 
 #include <time.h>
 
-#ifdef _WIN32
-#  define open _open
-#  define close _close
-#endif
-
 #include "MEM_guardedalloc.h"
 
 #include "DNA_constraint_types.h"
diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c
index 6c86554ad77..dafe5ca55ff 100644
--- a/source/blender/blenkernel/intern/packedFile.c
+++ b/source/blender/blenkernel/intern/packedFile.c
@@ -59,14 +59,6 @@
 #include "BKE_report.h"
 #include "BKE_sound.h"
 
-#ifdef _WIN32
-#define open _open
-#define close _close
-#define read _read
-#define write _write
-#endif
-
-
 int seekPackedFile(PackedFile *pf, int offset, int whence)
 {
 	int oldseek = -1, seek = 0;
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c
index 1124d06f851..f0bcfcea62d 100644
--- a/source/blender/imbuf/intern/readimage.c
+++ b/source/blender/imbuf/intern/readimage.c
@@ -37,9 +37,6 @@
 #  include <stddef.h>
 #  include <sys/types.h>
 #  include "mmap_win.h"
-#  define open _open
-#  define read _read
-#  define close _close
 #endif
 
 #include <stdlib.h>
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index 052059e3a5e..fbb28849ce6 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -34,9 +34,6 @@
 
 #ifdef _WIN32
 #  include <io.h>
-#  define open _open
-#  define read _read
-#  define close _close
 #endif
 
 #include <stdlib.h>
-- 
cgit v1.2.3