From 21ff5b84a5c62b0f9770b795786135396c498e7d Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Fri, 14 Aug 2009 05:17:51 +0200
Subject: [PATCH] Fix symbols renaming for flock

---
 lib/roken/flock.c            | 2 +-
 lib/roken/roken.h.in         | 4 ++--
 lib/roken/version-script.map | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/roken/flock.c b/lib/roken/flock.c
index d7f32583e..e15a3f796 100644
--- a/lib/roken/flock.c
+++ b/lib/roken/flock.c
@@ -41,7 +41,7 @@
 #define OP_MASK (LOCK_SH | LOCK_EX | LOCK_UN)
 
 int ROKEN_LIB_FUNCTION
-flock(int fd, int operation)
+rk_flock(int fd, int operation)
 {
 #if defined(HAVE_FCNTL) && defined(F_SETLK)
   struct flock arg;
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 3fce13687..dc383a305 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -470,8 +470,8 @@ unsigned short ROKEN_LIB_FUNCTION bswap16(unsigned short);
 #define LOCK_UN   8		/* Unlock */
 #endif
 
-#define flock rk_flock
-int flock(int fd, int operation);
+#define flock(_x,_y) rk_flock(_x,_y)
+int rk_flock(int fd, int operation);
 #endif /* HAVE_FLOCK */
 
 time_t ROKEN_LIB_FUNCTION tm2time (struct tm, int);
diff --git a/lib/roken/version-script.map b/lib/roken/version-script.map
index bd29eff74..20017953c 100644
--- a/lib/roken/version-script.map
+++ b/lib/roken/version-script.map
@@ -56,6 +56,7 @@ HEIMDAL_ROKEN_1.0 {
 		rk_esetenv;
 		rk_estrdup;
 		rk_ewrite;
+		rk_flock;
 		rk_fnmatch;
 		rk_free_environment;
 		rk_freeaddrinfo;