]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Move some code under #ifdef guards. This works, but the main reason we
authordeal <deal@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 21 Oct 2004 13:51:44 +0000 (13:51 +0000)
committerdeal <deal@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 21 Oct 2004 13:51:44 +0000 (13:51 +0000)
do it is that if we include these header files icc71 can't be used any
more on newer linux systems due to a stupid interaction with
/usr/include/linux.h that simply kicks out non-gcc versions (icc8
identifies itself as gcc, so isn't affected)...

git-svn-id: https://svn.dealii.org/trunk@9716 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/source/sparse_direct.cc

index 46b0d5f4ccc40c2eb85b416a99de6128421232e9..332bd21ff7e939fc7af31a4080ce0b17d750cd7a 100644 (file)
 #include <list>
 #include <typeinfo>
 
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <unistd.h>
-
-#ifndef DEAL_II_USE_DIRECT_ERRNO_H
-#  include <errno.h>
-#else
-#  include </usr/include/errno.h>
-#endif
-#include <sys/errno.h>
-
 
 // if we know that at least one of the HSL functions are there,
 // include the respective include file. Otherwise save some CPU cycles
 // in the compiler
+//
+// also, we don't need all the other headers if the respective hsl
+// routines aren't used
 #if defined(HAVE_HSL_MA27) || defined(HAVE_HSL_MA47)
 #  include <hsl/hsl.h>
+
+#  include <sys/wait.h>
+#  include <sys/types.h>
+#  include <signal.h>
+#  include <unistd.h>
+
+#  ifndef DEAL_II_USE_DIRECT_ERRNO_H
+#    include <errno.h>
+#  else
+#    include </usr/include/errno.h>
+#  endif
+#  include <sys/errno.h>
 #endif
 
 // include UMFPACK file.

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.