8e053ee7cb
enhancements: - Simple command-line tools to interface with VMware host - Guest OS scripts that can be triggered by the VMware host - Startup script When compiled with X11 support (the default), this release also provides: - GTK+-based GUI to configure time sync, device connections, and scripts - Helper application to interface with the xf86-video-vmware driver, enabling dynamic screen resize
49 lines
1.5 KiB
Text
49 lines
1.5 KiB
Text
$NetBSD: patch-ah,v 1.2 2008/08/31 06:36:47 scottr Exp $
|
|
|
|
--- lib/file/fileIO.c.orig 2008-08-08 02:01:53.000000000 -0500
|
|
+++ lib/file/fileIO.c
|
|
@@ -254,7 +254,7 @@ FileIO_Lock(FileIODescriptor *file, // I
|
|
|
|
ASSERT(file);
|
|
|
|
-#if !defined(__FreeBSD__) && !defined(sun)
|
|
+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__)
|
|
if (access & FILEIO_OPEN_LOCKED) {
|
|
int err;
|
|
|
|
@@ -286,7 +286,7 @@ FileIO_Lock(FileIODescriptor *file, // I
|
|
}
|
|
#else
|
|
ASSERT(file->lockToken == NULL);
|
|
-#endif // !__FreeBSD__ && !sun
|
|
+#endif // !__FreeBSD__ && !sun && !defined(__NetBSD__)
|
|
|
|
return ret;
|
|
}
|
|
@@ -316,7 +316,7 @@ FileIO_Unlock(FileIODescriptor *file)
|
|
|
|
ASSERT(file);
|
|
|
|
-#if !defined(__FreeBSD__) && !defined(sun)
|
|
+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__)
|
|
if (file->lockToken != NULL) {
|
|
int err;
|
|
|
|
@@ -333,7 +333,7 @@ FileIO_Unlock(FileIODescriptor *file)
|
|
}
|
|
#else
|
|
ASSERT(file->lockToken == NULL);
|
|
-#endif // !__FreeBSD__ && !sun
|
|
+#endif // !__FreeBSD__ && !sun && !defined(__NetBSD__)
|
|
|
|
return ret;
|
|
}
|
|
@@ -449,7 +449,7 @@ FileIO_StatsExit(const FileIODescriptor
|
|
/*
|
|
* Pwrite & Pread are not available in the FreeBSD tools build VM
|
|
*/
|
|
-#if !defined(VMX86_TOOLS) || !defined(__FreeBSD__)
|
|
+#if !defined(VMX86_TOOLS) || !defined(__FreeBSD__) && !defined(__NetBSD__)
|
|
#if defined(_WIN32) || defined(GLIBC_VERSION_21) || defined(__APPLE__)
|
|
/*
|
|
*----------------------------------------------------------------------
|