[vlc-commits] win32: do not pretend to implement ftrylockfile()

Rémi Denis-Courmont git at videolan.org
Sun Nov 20 10:48:50 CET 2016


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 20 11:48:16 2016 +0200| [fde9226ab2a8ed833067117c984f58a57f327c38] | committer: Rémi Denis-Courmont

win32: do not pretend to implement ftrylockfile()

This is not currently used anywhere in the code base anyway.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fde9226ab2a8ed833067117c984f58a57f327c38
---

 compat/flockfile.c   | 6 ------
 include/vlc_fixups.h | 1 -
 2 files changed, 7 deletions(-)

diff --git a/compat/flockfile.c b/compat/flockfile.c
index d01fd1f..afe8a3e 100644
--- a/compat/flockfile.c
+++ b/compat/flockfile.c
@@ -40,12 +40,6 @@ void flockfile (FILE *stream)
     _lock_file (stream);
 }
 
-int ftrylockfile (FILE *stream)
-{
-    flockfile (stream); /* Move along people, there is nothing to see here. */
-    return 0;
-}
-
 void funlockfile (FILE *stream)
 {
     _unlock_file (stream);
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 8b607a3..3b80f9d 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -122,7 +122,6 @@ int asprintf (char **, const char *, ...);
 
 #ifndef HAVE_FLOCKFILE
 void flockfile (FILE *);
-int ftrylockfile (FILE *);
 void funlockfile (FILE *);
 int getc_unlocked (FILE *);
 int getchar_unlocked (void);



More information about the vlc-commits mailing list