Changeset f2f7da in git

Timestamp:

Mar 19, 2021, 3:41:51 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2c5e6915fcb7bea0992cbde73d5924fccef312af

Parents:

e8b6b3f6db0ff6cd2d7a2e771c5c2be12ce99ae952faf17cb6bb37a065136b8a7cf05714af39bb84

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-03-19 15:41:51+01:00

git-committer:

GitHub <noreply@github.com>2021-03-19 15:41:51+01:00

Message:

Merge pull request #1064 from kliem/reorder_cdd_preference

prefer cddlib/ over cdd/

Files:

• Singular/dyn_modules/gfanlib/gfan.h (modified) (1 diff)
• gfanlib/gfanlib_zcone.cpp (modified) (1 diff)

Singular/dyn_modules/gfanlib/gfan.h

@@ -14 +14 @@
 
 #include "gfanlib/config.h"
+#ifdef HAVE_CDDLIB_SETOPER_H
+#include <cddlib/setoper.h>
+#include <cddlib/cdd.h>
+#include <cddlib/cddmp.h>
+#else
 #ifdef HAVE_CDD_SETOPER_H
 #include <cdd/setoper.h>
 #include <cdd/cdd.h>
 #include <cdd/cddmp.h>
-#elif HAVE_CDDLIB_SETOPER_H
-#include <cddlib/setoper.h>
-#include <cddlib/cdd.h>
-#include <cddlib/cddmp.h>
 #else
 #include <setoper.h>
 #include <cdd.h>
 #include <cddmp.h>
+#endif
 #endif
 #include "bbfan.h"

gfanlib/gfanlib_zcone.cpp

@@ -15 +15 @@
 extern "C"
 {
+#ifdef HAVE_CDDLIB_SETOPER_H
+#include <cddlib/setoper.h>
+#include <cddlib/cdd.h>
+#else
 #ifdef HAVE_CDD_SETOPER_H
 #include <cdd/setoper.h>
 #include <cdd/cdd.h>
-#else
-#ifdef HAVE_CDDLIB_SETOPER_H
-#include <cddlib/setoper.h>
-#include <cddlib/cdd.h>
 #else
 #include <setoper.h>