Created attachment 23496 [details]
This patch removes the original definition and uses more conditionals to create the definition once.

When configuring with --enable-flock, compiler produces warning stating a redefine of USE_FLOCK_LK in common/jk_mt.h

This patch removes the original definition and uses more conditionals to create the definition once.

Example warning:
/opt/apps/apr/build-1/libtool --silent --mode=compile gcc -I/opt/apps/apache/include -g -O2 -DJK_USE_FLOCK -g -O2 -pthread -DHAVE_APR  -I/opt/apps/apr/include/apr-1 -I/opt/apps/apr/include/apr-1 -g -O2 -DJK_USE_FLOCK -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -I /include -I /include/ -c jk_url.c -o jk_url.lo
In file included from jk_uri_worker_map.h:36,
                 from jk_service.h:35,
                 from jk_util.h:32,
                 from jk_url.h:27,
                 from jk_url.c:24:
jk_mt.h:95:1: warning: "USE_FLOCK_LK" redefined
jk_mt.h:92:1: warning: this is the location of the previous definition