From 647d35550c3312608777511a8d2a93a1ca14e6cc Mon Sep 17 00:00:00 2001
From: Ron Wein <wein@post.tau.ac.il>
Date: Tue, 7 Mar 2006 07:37:56 +0000
Subject: [PATCH] Made sure we include CGAL_basic.h before referring to any
 CGAL_USE_ flags.

---
 Arrangement_2/demo/Arrangement_2/MyWindow.C   | 22 +++++++++++++------
 .../Arrangement_2/ex_conic_multiplicities.C   |  2 ++
 .../examples/Arrangement_2/ex_conics.C        |  2 ++
 .../Arrangement_2/ex_rational_functions.C     |  2 ++
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Arrangement_2/demo/Arrangement_2/MyWindow.C b/Arrangement_2/demo/Arrangement_2/MyWindow.C
index 21dfb6cca37..95966373e4b 100644
--- a/Arrangement_2/demo/Arrangement_2/MyWindow.C
+++ b/Arrangement_2/demo/Arrangement_2/MyWindow.C
@@ -21,6 +21,7 @@
 #include <CGAL/basic.h>
 
 #ifdef CGAL_USE_QT
+#ifdef CGAL_USE_CORE
 
 #include "MyWindow.h"
 #include "forms.h"
@@ -435,20 +436,27 @@ int main(int argc, char **argv)
   return app.exec();  
 }
 
-#else 
+#else // CGAL_USE_CORE not defined:
 
 #include <iostream>
 
+int main(int, char*)
+{
+  std::cout << "Sorry, this demo needs CORE ..." << std::endl;
+
+  return (0);
+}
+
+#endif // CGAL_USE_CORE
+#else // CGAL_USE_QT not defined:
+
+#include <iostream>
 
 int main(int, char*)
 {
 
-  std::cout << "Sorry, this demo needs QT...";
-  std::cout << std::endl;
-
-  return 0;
+  std::cout << "Sorry, this demo needs QT ..." << std::endl;
+  return (0);
 }
 
-
-
 #endif // CGAL_USE_QT
diff --git a/Arrangement_2/examples/Arrangement_2/ex_conic_multiplicities.C b/Arrangement_2/examples/Arrangement_2/ex_conic_multiplicities.C
index ce3c2d827a9..4eec23610ab 100644
--- a/Arrangement_2/examples/Arrangement_2/ex_conic_multiplicities.C
+++ b/Arrangement_2/examples/Arrangement_2/ex_conic_multiplicities.C
@@ -1,5 +1,7 @@
 //! \file examples/Arrangement_2/ex_conic_multiplicities.C
 // Handling intersection points with multiplicity between conic arcs.
+#include <CGAL/basic.h>
+
 #ifndef CGAL_USE_CORE
 #include <iostream>
 int main ()
diff --git a/Arrangement_2/examples/Arrangement_2/ex_conics.C b/Arrangement_2/examples/Arrangement_2/ex_conics.C
index db6c0e11456..8a03e8e0cd3 100644
--- a/Arrangement_2/examples/Arrangement_2/ex_conics.C
+++ b/Arrangement_2/examples/Arrangement_2/ex_conics.C
@@ -1,5 +1,7 @@
 //! \file examples/Arrangement_2/ex_conics.C
 // Constructing an arrangement of various conic arcs.
+#include <CGAL/basic.h>
+
 #ifndef CGAL_USE_CORE
 #include <iostream>
 int main ()
diff --git a/Arrangement_2/examples/Arrangement_2/ex_rational_functions.C b/Arrangement_2/examples/Arrangement_2/ex_rational_functions.C
index 714c81419a2..e9366446e0c 100644
--- a/Arrangement_2/examples/Arrangement_2/ex_rational_functions.C
+++ b/Arrangement_2/examples/Arrangement_2/ex_rational_functions.C
@@ -1,5 +1,7 @@
 //! \file examples/Arrangement_2/ex_rational_functions.C
 // Constructing an arrangement of arcs of rational functions.
+#include <CGAL/basic.h>
+
 #ifndef CGAL_USE_CORE
 #include <iostream>
 int main ()