#6 Build fails when F_GETLK64 == F_GETLK

[Charles Duffy]

g++ -g -O2 -Wall -Ilib -c lib/fcntl.cc -fPIC -DPIC -o lib/.libs/fcntl.o
lib/fcntl.cc: In function `int fcntl(int, int, ...)':
lib/fcntl.cc:55: error: duplicate case value
lib/fcntl.cc:49: error: previously used here
lib/fcntl.cc:56: error: duplicate case value
lib/fcntl.cc:50: error: previously used here
lib/fcntl.cc:57: error: duplicate case value
lib/fcntl.cc:51: error: previously used here
lib/fcntl.cc: In function `int __fcntl(int, int, ...)':
lib/fcntl.cc:109: error: duplicate case value
lib/fcntl.cc:103: error: previously used here
lib/fcntl.cc:110: error: duplicate case value
lib/fcntl.cc:104: error: previously used here
lib/fcntl.cc:111: error: duplicate case value
lib/fcntl.cc:105: error: previously used here
make: *** [lib/fcntl.lo] Error 1

--- plasticfs-1.9/lib/fcntl.cc 2004-07-06 00:13:06.000000000 -0500
+++ plasticfs-1.9.new/lib/fcntl.cc 2007-07-04 12:17:51.000000000 -0500
@@ -46,11 +46,13 @@
arg = (void *)va_arg(ap, long);
break;

+#if F_GETLK != F_GETLK64
case F_GETLK:
case F_SETLK:
case F_SETLKW:
arg = (void *)va_arg(ap, flock *);
break;
+#endif

case F_GETLK64:
case F_SETLK64:
@@ -100,11 +102,13 @@
arg = (void *)va_arg(ap, long);
break;

+#if F_GETLK != F_GETLK64
case F_GETLK:
case F_SETLK:
case F_SETLKW:
arg = (void *)va_arg(ap, flock *);
break;
+#endif

case F_GETLK64:
case F_SETLK64:

[Charles Duffy]

[Charles Duffy]

Logged In: YES
user_id=44367
Originator: YES

Patch provided as a proper attachment this time.
File Added: plasticfs-amd64-fcntl.patch

[Peter Miller]

Logged In: YES
user_id=160
Originator: NO

Thanks for the patch. Will be fixed in 1.10