summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2011-04-20 13:17:33 +0000
committerChris Wilson <chris+github@qwirx.com>2011-04-20 13:17:33 +0000
commit46d65d06b31b88af89d45a837d0af4a92aebc78f (patch)
tree9172e4decfe03151768d7c8ce7e61cff1830797c
parentaba6a8731ed0ebc85dea199228948f9914d5d717 (diff)
Remove getpid() emulation now that it's included in the SDK, which causes
a conflict.
-rw-r--r--lib/win32/emu.h19
1 files changed, 8 insertions, 11 deletions
diff --git a/lib/win32/emu.h b/lib/win32/emu.h
index b7aa5d47..1ebd45c2 100644
--- a/lib/win32/emu.h
+++ b/lib/win32/emu.h
@@ -333,11 +333,6 @@ inline int ioctl(SOCKET sock, int flag, int * something)
return 0;
}
-extern "C" inline int getpid()
-{
- return (int)GetCurrentProcessId();
-}
-
inline int waitpid(pid_t pid, int *status, int)
{
return 0;
@@ -377,12 +372,12 @@ int emu_chmod (const char* pName, mode_t mode);
char* emu_getcwd (char* pBuffer, int BufSize);
int emu_rename (const char* pOldName, const char* pNewName);
-#define chdir(directory) emu_chdir (directory)
-#define mkdir(path, mode) emu_mkdir (path)
-#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 chdir(directory) emu_chdir (directory)
+#define mkdir(path, mode) emu_mkdir (path)
+#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)
// Not safe to replace stat/fstat/lstat on mingw at least, as struct stat
@@ -441,6 +436,8 @@ int console_read(char* pBuffer, size_t BufferSize);
// Defined thus by MinGW, but missing from MSVC
// [http://curl.haxx.se/mail/lib-2004-11/0260.html]
+// note: chsize() doesn't work over 2GB:
+// [https://stat.ethz.ch/pipermail/r-devel/2005-May/033339.html]
#ifndef HAVE_FTRUNCATE
int ftruncate(int, off_t);
inline int ftruncate(int __fd, off_t __length)