fixup! Locking data structures

diff --git a/configure.ac b/configure.ac
index 7f726aad7555a503a0f419f32c9af6753a86a045..c97dd2b56aed19235b6f403d0657d6cef05c3fcf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -141,12 +141,11 @@ else
 fi
 
 # This is assumed to be necessary for proper BIRD build
-CFLAGS="$CFLAGS -fno-strict-aliasing -fno-strict-overflow"
+CFLAGS="$CFLAGS -fno-strict-aliasing -fno-strict-overflow -fms-extensions"
 
 if test "$bird_cflags_default" = yes ; then
   BIRD_CHECK_GCC_OPTION([bird_cv_c_option_wno_pointer_sign], [-Wno-pointer-sign], [-Wall])
   BIRD_CHECK_GCC_OPTION([bird_cv_c_option_wno_missing_init], [-Wno-missing-field-initializers], [-Wall -Wextra])
-  BIRD_CHECK_GCC_OPTION([bird_cv_c_option_fms_extensions], [-fms-extensions], [-Wall -Wextra])
   BIRD_CHECK_GCC_OPTION([bird_cv_c_option_wno_microsoft_anon_tag], [-Wno-microsoft-anon-tag], [-Wall -Wextra])
 
 
@@ -164,7 +163,6 @@ if test "$bird_cflags_default" = yes ; then
   CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes -Wno-parentheses"
   BIRD_ADD_GCC_OPTION([bird_cv_c_option_wno_pointer_sign], [-Wno-pointer-sign])
   BIRD_ADD_GCC_OPTION([bird_cv_c_option_wno_missing_init], [-Wno-missing-field-initializers])
-  BIRD_ADD_GCC_OPTION([bird_cv_c_option_fms_extensions], [-fms-extensions])
   BIRD_ADD_GCC_OPTION([bird_cv_c_option_wno_microsoft_anon_tag], [-Wno-microsoft-anon-tag])
 fi
 

diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index 1740fb95489ea72f5ccf10606b9ed6584a497f7f..84116120aa69b852a4aef7252189b65003e89faa 100755 (executable)
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -14,8 +14,8 @@ COMMON_FLAGS= --prefix=/usr --sysconfdir=/etc/bird --mandir=\$${prefix}/share/ma
        --docdir=\$${prefix}/share/bird2 \
        --enable-client
 
-CFLAGS += -g -O2 -fno-strict-aliasing -fno-strict-overflow -fPIC
-LDFLAGS += -g -O2 -fno-strict-aliasing -fno-strict-overflow -fPIC -Wl,-z,defs -Wl,--as-needed
+CFLAGS += -g -O2 -fno-strict-aliasing -fno-strict-overflow -fms-extensions -fPIC
+LDFLAGS += -g -O2 -fno-strict-aliasing -fno-strict-overflow -fms-extensions -fPIC -Wl,-z,defs -Wl,--as-needed
 
 %:
        dh $@