diff --git a/src/configure.in b/src/configure.in
index 5286306e5da39469aebdaf4f8e0d2d31366aa369..277e026baf787682a8d9bf5225380bbc8eddbe03 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -6409,16 +6409,12 @@ __declspec(noreturn) void fatal(char *foo,...)
 AC_MSG_RESULT($pike_cv_lc___declspec)
 if test "$pike_cv_lc___declspec" = yes; then
   AC_DEFINE(HAVE_DECLSPEC)
-else
-
-  # NOTE: Avoid using __attribute__ if __declspec is available.
-  #       This is a kludge to descrease the number of warnings
-  #       on ecc.
+fi
 
-  AC_MSG_CHECKING(for gcc function attributes)
-  AC_CACHE_VAL(pike_cv_gcc_attributes,
-  [
-    AC_TRY_RUN([
+AC_MSG_CHECKING(for gcc function attributes)
+AC_CACHE_VAL(pike_cv_gcc_attributes,
+[
+  AC_TRY_RUN([
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -6438,9 +6434,9 @@ void fatal(char *foo,...)
 
 int main() {  exit(0); }
 
-    ], pike_cv_gcc_attributes=yes, pike_cv_gcc_attributes=no, [
-      echo $ac_n "crosscompiling... $ac_c" 1>&6
-      AC_TRY_LINK([
+  ], pike_cv_gcc_attributes=yes, pike_cv_gcc_attributes=no, [
+    echo $ac_n "crosscompiling... $ac_c" 1>&6
+    AC_TRY_LINK([
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -6457,16 +6453,15 @@ void fatal(char *foo,...)
   va_end(args);
   exit(2);
 }
-      ], [
+    ], [
   exit(0);
-      ], pike_cv_gcc_attributes=yes, pike_cv_gcc_attributes=no)
-    ])
+    ], pike_cv_gcc_attributes=yes, pike_cv_gcc_attributes=no)
   ])
+])
 
-  AC_MSG_RESULT($pike_cv_gcc_attributes)
-  if test "$pike_cv_gcc_attributes" = yes; then
-    AC_DEFINE(HAVE_FUNCTION_ATTRIBUTES)
-  fi
+AC_MSG_RESULT($pike_cv_gcc_attributes)
+if test "$pike_cv_gcc_attributes" = yes; then
+  AC_DEFINE(HAVE_FUNCTION_ATTRIBUTES)
 fi
 
 AC_MSG_CHECKING(if va_list is a state pointer)