Commit dd37ffa0 authored by Mark Andrews's avatar Mark Andrews
Browse files

fix bad merge

parent 43c82dff
......@@ -6343,17 +6343,11 @@ fi
# AC_TRY_COMPILE & etc).
CFLAGS="$CFLAGS $STD_CWARNINGS"
<<<<<<< HEAD
=======
# Try to add the bind include directory
CFLAGS="$CFLAGS -I$libbind/include"
case "$host" in
*-darwin*)
CFLAGS="$CFLAGS -D__APPLE_USE_RFC_3542" ;;
esac
>>>>>>> 9fc3e9f... - Use newer auto* tool packages and turn on RFC_3542 support on Mac OS.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flexible array members" >&5
$as_echo_n "checking for flexible array members... " >&6; }
......
......@@ -588,9 +588,6 @@ AC_CHECK_MEMBER(struct msghdr.msg_control,,
# AC_TRY_COMPILE & etc).
CFLAGS="$CFLAGS $STD_CWARNINGS"
# Try to add the bind include directory
CFLAGS="$CFLAGS -I$libbind/include"
case "$host" in
*-darwin*)
CFLAGS="$CFLAGS -D__APPLE_USE_RFC_3542" ;;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment