From: Matthias Maier Date: Tue, 23 Dec 2014 20:39:09 +0000 (+0100) Subject: fix compilation against opencascade on linux targets X-Git-Tag: v8.3.0-rc1~589^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=299ebcf6b8266fbd9aea5deea6f2fff31f9b8b01;p=dealii.git fix compilation against opencascade on linux targets --- diff --git a/include/deal.II/opencascade/boundary_lib.h b/include/deal.II/opencascade/boundary_lib.h index e1633b11a0..af936c0574 100644 --- a/include/deal.II/opencascade/boundary_lib.h +++ b/include/deal.II/opencascade/boundary_lib.h @@ -25,8 +25,19 @@ #include #include +// We have to clean up certain name clashes prior to any opencascade header +// inclusion. Unfortunately, this is clumsy and should be resolved by +// renaming our very own includes someday... +// --Maier, 2014 +#define HAVE_CONFIG_H +#undef HAVE_SYS_TYPES_H +#undef HAVE_SYS_TIMES_H +#undef HAVE_SYS_TIME_H +#undef HAVE_UNISTD_H +#undef HAVE_GETHOSTNAME #include #include +#undef HAVE_CONFIG_H DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/opencascade/utilities.h b/include/deal.II/opencascade/utilities.h index 8347fa14d5..d01cc623eb 100644 --- a/include/deal.II/opencascade/utilities.h +++ b/include/deal.II/opencascade/utilities.h @@ -23,8 +23,20 @@ #ifdef DEAL_II_WITH_OPENCASCADE #include +#include #include + +// We have to clean up certain name clashes prior to any opencascade header +// inclusion. Unfortunately, this is clumsy and should be resolved by +// renaming our very own includes someday... +// --Maier, 2014 +#define HAVE_CONFIG_H +#undef HAVE_SYS_TYPES_H +#undef HAVE_SYS_TIMES_H +#undef HAVE_SYS_TIME_H +#undef HAVE_UNISTD_H +#undef HAVE_GETHOSTNAME #include #include #include @@ -36,8 +48,8 @@ #include #include #include +#undef HAVE_CONFIG_H -#include DEAL_II_NAMESPACE_OPEN