summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2009-06-09 08:22:09 +0000
committerMartin Blapp <mbr@FreeBSD.org>2009-06-09 08:22:09 +0000
commit41e5f0b9a039b1686af95cbc0c0f5dfb9db65bf4 (patch)
treec55f79a4a7a39019a9060cefa14b5f7ad613e719 /emulators
parent- Update to 0.21 (diff)
Delete two unneeded patches.
PR: misc/135400 Submitted by: John Fox Maule <john@fox-maule.dk>
Notes
Notes: svn path=/head/; revision=235480
Diffstat (limited to 'emulators')
-rw-r--r--emulators/open-vm-tools/files/patch-vmblock-fuse-Makefile35
-rw-r--r--emulators/open-vm-tools/files/patch-vmblock-fuse-block.c14
2 files changed, 0 insertions, 49 deletions
diff --git a/emulators/open-vm-tools/files/patch-vmblock-fuse-Makefile b/emulators/open-vm-tools/files/patch-vmblock-fuse-Makefile
deleted file mode 100644
index f5402744072a..000000000000
--- a/emulators/open-vm-tools/files/patch-vmblock-fuse-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- vmblock-fuse/Makefile.am.orig 2009-02-18 17:00:54.000000000 +0900
-+++ vmblock-fuse/Makefile.am 2009-03-01 16:41:24.000000000 +0900
-@@ -17,13 +17,13 @@
-
- bin_PROGRAMS = vmware-vmblock-fuse
-
--# _XOPEN_SOURCE needs to be defined to at least 500 when compiling
--# vmblock-fuse's os.h to get pthread_rwlock_t.
-+# _XOPEN_SOURCE needs to be defined to at least 600 when compiling
-+# vmblock-fuse's fsops.c to get lstat.
- # -D_FILE_OFFSET_BITS=64 required for fuse.
-
- AM_CFLAGS =
- AM_CFLAGS += -Dvmblock_fuse
--AM_CFLAGS += -D_XOPEN_SOURCE=500
-+AM_CFLAGS += -D_XOPEN_SOURCE=600
- AM_CFLAGS += -DUSERLEVEL
- AM_CFLAGS += -D_FILE_OFFSET_BITS=64
- AM_CFLAGS += @FUSE_CPPFLAGS@
---- vmblock-fuse/Makefile.in.orig 2009-02-18 17:03:18.000000000 +0900
-+++ vmblock-fuse/Makefile.in 2009-03-01 16:50:47.000000000 +0900
-@@ -263,10 +263,10 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-
--# _XOPEN_SOURCE needs to be defined to at least 500 when compiling
--# vmblock-fuse's os.h to get pthread_rwlock_t.
-+# _XOPEN_SOURCE needs to be defined to at least 600 when compiling
-+# vmblock-fuse's fsops.c to get lstat.
- # -D_FILE_OFFSET_BITS=64 required for fuse.
--AM_CFLAGS = -Dvmblock_fuse -D_XOPEN_SOURCE=500 -DUSERLEVEL \
-+AM_CFLAGS = -Dvmblock_fuse -D_XOPEN_SOURCE=600 -DUSERLEVEL \
- -D_FILE_OFFSET_BITS=64 @FUSE_CPPFLAGS@ @VMWARE_USER_CPPFLAGS@
- vmware_vmblock_fuse_LDADD = ../lib/misc/libMisc.la @FUSE_LIBS@ \
- $(am__append_1)
diff --git a/emulators/open-vm-tools/files/patch-vmblock-fuse-block.c b/emulators/open-vm-tools/files/patch-vmblock-fuse-block.c
deleted file mode 100644
index 52cdf13dd4ae..000000000000
--- a/emulators/open-vm-tools/files/patch-vmblock-fuse-block.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- vmblock-fuse/block.c.orig 2009-02-18 17:02:53.000000000 +0900
-+++ vmblock-fuse/block.c 2009-03-01 16:37:11.000000000 +0900
-@@ -519,11 +519,7 @@
- struct DblLnkLst_Links *curr;
-
- /* XXX The following is only temporary. */
--#ifdef __FreeBSD__
-- os_assert_rwlock_held(&blockedFilesLock);
--#else
- ASSERT(os_rwlock_held(&blockedFilesLock));
--#endif
-
- DblLnkLst_ForEach(curr, &blockedFiles) {
- BlockInfo *currBlock = DblLnkLst_Container(curr, BlockInfo, links);