f0ec7d5218
- update to 2.17: Too many changes to list, a full list of changes is available in the included LOGFILE. - Rebase patches, renamed ccx-2.16-spooles-dynamic.patch -> 0001-Fixup-spooles-include-dir.patch - Add 0001-Add-missing-argument-for-inputerror-function-call.patch - Add 0001-Use-interface-for-cubtri-callback-function.patch - Enable check section OBS-URL: https://build.opensuse.org/request/show/874675 OBS-URL: https://build.opensuse.org/package/show/science/ccx?expand=0&rev=11
69 lines
1.5 KiB
Diff
69 lines
1.5 KiB
Diff
From e551c655e45c8aa84b60a2540a35eecfd4d9cc5f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Thu, 12 Nov 2020 03:59:31 +0100
|
|
Subject: [PATCH] Fixup spooles include dir
|
|
|
|
---
|
|
src/cascade.c | 6 +++---
|
|
src/cascadefem.c | 6 +++---
|
|
src/spooles.h | 8 ++++----
|
|
3 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/cascade.c b/src/cascade.c
|
|
index 796d5cf..c996f12 100644
|
|
--- a/src/cascade.c
|
|
+++ b/src/cascade.c
|
|
@@ -21,9 +21,9 @@
|
|
#include <string.h>
|
|
|
|
#ifdef SPOOLES
|
|
-#include <misc.h>
|
|
-#include <FrontMtx.h>
|
|
-#include <SymbFac.h>
|
|
+#include <spooles/misc.h>
|
|
+#include <spooles/FrontMtx.h>
|
|
+#include <spooles/SymbFac.h>
|
|
#endif
|
|
|
|
#include "CalculiX.h"
|
|
diff --git a/src/cascadefem.c b/src/cascadefem.c
|
|
index 308960c..578d4e3 100755
|
|
--- a/src/cascadefem.c
|
|
+++ b/src/cascadefem.c
|
|
@@ -21,9 +21,9 @@
|
|
#include <string.h>
|
|
|
|
#ifdef SPOOLES
|
|
-#include <misc.h>
|
|
-#include <FrontMtx.h>
|
|
-#include <SymbFac.h>
|
|
+#include <spooles/misc.h>
|
|
+#include <spooles/FrontMtx.h>
|
|
+#include <spooles/SymbFac.h>
|
|
#endif
|
|
|
|
#include "CalculiX.h"
|
|
diff --git a/src/spooles.h b/src/spooles.h
|
|
index 388f1ff..6966215 100755
|
|
--- a/src/spooles.h
|
|
+++ b/src/spooles.h
|
|
@@ -23,11 +23,11 @@
|
|
*/
|
|
|
|
#include <pthread.h>
|
|
-#include <misc.h>
|
|
-#include <FrontMtx.h>
|
|
-#include <SymbFac.h>
|
|
+#include <spooles/misc.h>
|
|
+#include <spooles/FrontMtx.h>
|
|
+#include <spooles/SymbFac.h>
|
|
#if USE_MT
|
|
-#include <MT/spoolesMT.h>
|
|
+#include <spooles/MT/spoolesMT.h>
|
|
#endif
|
|
|
|
/* increase this for debugging */
|
|
--
|
|
2.30.1
|
|
|