From 69b37fb3a7d231bb7ba1f8660f9c294fb1050049 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Mon, 28 Mar 2011 14:52:33 +0100 Subject: [PATCH] AIX: Add flock to roken Add the rk_flock() emulation function to roken, primarily for use on the AIX build, but it will also be used for WIN32 Change-Id: Ia8f11e19bbe9fdf721a7b72660d860624139d9b1 Reviewed-on: http://gerrit.openafs.org/4368 Reviewed-by: Derrick Brashear Tested-by: BuildBot Reviewed-by: Jeffrey Altman --- acinclude.m4 | 3 ++- src/roken/Makefile.in | 3 +++ src/roken/NTMakefile | 1 + src/roken/afsroken.def | 1 + src/roken/librokenafs.map | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 174f9c2..9f3390a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1320,7 +1320,7 @@ AC_SUBST(BUILD_LOGIN) AC_CHECK_FUNCS([ \ arc4random \ - flock \ + fcntl \ fseeko64 \ ftello64 \ getcwd \ @@ -1392,6 +1392,7 @@ AC_REPLACE_FUNCS([ \ erealloc \ err \ errx \ + flock \ getdtablesize \ getopt \ getprogname \ diff --git a/src/roken/Makefile.in b/src/roken/Makefile.in index ee6c876..770a9ac 100644 --- a/src/roken/Makefile.in +++ b/src/roken/Makefile.in @@ -100,6 +100,9 @@ err.o: ${UPSTREAM}/err.c err.h errx.o: ${UPSTREAM}/errx.c err.h $(AFS_CCRULE) $(UPSTREAM)/errx.c +flock.o: ${UPSTREAM}/flock.c + $(AFS_CCRULE) $(UPSTREAM)/flock.c + getopt.o: ${UPSTREAM}/getopt.c $(AFS_CCRULE) $(UPSTREAM)/getopt.c diff --git a/src/roken/NTMakefile b/src/roken/NTMakefile index 0a2f690..9c3ba09 100644 --- a/src/roken/NTMakefile +++ b/src/roken/NTMakefile @@ -32,6 +32,7 @@ ROKEN_OBJS = \ $(OUT)\erealloc.obj \ $(OUT)\err.obj \ $(OUT)\errx.obj \ + $(OUT)\flock.obj \ $(OUT)\getopt.obj \ $(OUT)\getprogname.obj \ $(OUT)\hex.obj \ diff --git a/src/roken/afsroken.def b/src/roken/afsroken.def index eda0fe6..aa7e820 100644 --- a/src/roken/afsroken.def +++ b/src/roken/afsroken.def @@ -35,3 +35,4 @@ EXPORTS rk_asprintf @39 rk_vsnprintf @40 rk_vasnprintf @41 + rk_flock @42 diff --git a/src/roken/librokenafs.map b/src/roken/librokenafs.map index 644628d..1cd8fad 100644 --- a/src/roken/librokenafs.map +++ b/src/roken/librokenafs.map @@ -18,6 +18,7 @@ rk_ecalloc; rk_emalloc; rk_erealloc; + rk_flock; rk_hex_encode; rk_mkstemp; rk_print_version; -- 1.9.4