summaryrefslogtreecommitdiff
path: root/lib/win32
diff options
context:
space:
mode:
Diffstat (limited to 'lib/win32')
-rw-r--r--[-rwxr-xr-x]lib/win32/MSG00001.binbin32 -> 32 bytes
-rw-r--r--[-rwxr-xr-x]lib/win32/bsd_getopt.h0
-rw-r--r--lib/win32/emu.h22
-rw-r--r--[-rwxr-xr-x]lib/win32/getopt_long.cpp0
-rw-r--r--[-rwxr-xr-x]lib/win32/messages.h0
-rw-r--r--[-rwxr-xr-x]lib/win32/messages.rc0
6 files changed, 14 insertions, 8 deletions
diff --git a/lib/win32/MSG00001.bin b/lib/win32/MSG00001.bin
index b4377b85..b4377b85 100755..100644
--- a/lib/win32/MSG00001.bin
+++ b/lib/win32/MSG00001.bin
Binary files differ
diff --git a/lib/win32/bsd_getopt.h b/lib/win32/bsd_getopt.h
index 3e2441ca..3e2441ca 100755..100644
--- a/lib/win32/bsd_getopt.h
+++ b/lib/win32/bsd_getopt.h
diff --git a/lib/win32/emu.h b/lib/win32/emu.h
index 91793004..9b6ec117 100644
--- a/lib/win32/emu.h
+++ b/lib/win32/emu.h
@@ -4,14 +4,18 @@
#ifdef WIN32
#define EMU_STRUCT_STAT struct emu_stat
- #define EMU_STAT emu_stat
- #define EMU_FSTAT emu_fstat
- #define EMU_LSTAT emu_stat
+ #define EMU_STAT emu_stat
+ #define EMU_FSTAT emu_fstat
+ #define EMU_LSTAT emu_stat
+ #define EMU_LINK emu_link
+ #define EMU_UNLINK emu_unlink
#else
#define EMU_STRUCT_STAT struct stat
- #define EMU_STAT ::stat
- #define EMU_FSTAT ::fstat
- #define EMU_LSTAT ::lstat
+ #define EMU_STAT ::stat
+ #define EMU_FSTAT ::fstat
+ #define EMU_LSTAT ::lstat
+ #define EMU_LINK ::link
+ #define EMU_UNLINK ::unlink
#endif
#if ! defined EMU_INCLUDE && defined WIN32
@@ -352,13 +356,15 @@ int emu_rename (const char* pOldName, const char* pNewName);
#define chdir(directory) emu_chdir (directory)
#define mkdir(path, mode) emu_mkdir (path)
-#define link(oldpath, newpath) emu_link (oldpath, newpath)
-#define unlink(file) emu_unlink (file)
#define utimes(buffer, times) emu_utimes (buffer, times)
#define chmod(file, mode) emu_chmod (file, mode)
#define getcwd(buffer, size) emu_getcwd (buffer, size)
#define rename(oldname, newname) emu_rename (oldname, newname)
+// link() and unlink() conflict with Boost if implemented using macros like
+// the others above, so I've removed the macros and you need to use EMU_LINK
+// and EMU_UNLINK everywhere.
+
// Not safe to replace stat/fstat/lstat on mingw at least, as struct stat
// has a 16-bit st_ino and we need a 64-bit one.
//
diff --git a/lib/win32/getopt_long.cpp b/lib/win32/getopt_long.cpp
index af2833a1..af2833a1 100755..100644
--- a/lib/win32/getopt_long.cpp
+++ b/lib/win32/getopt_long.cpp
diff --git a/lib/win32/messages.h b/lib/win32/messages.h
index 22290226..22290226 100755..100644
--- a/lib/win32/messages.h
+++ b/lib/win32/messages.h
diff --git a/lib/win32/messages.rc b/lib/win32/messages.rc
index 116522b7..116522b7 100755..100644
--- a/lib/win32/messages.rc
+++ b/lib/win32/messages.rc