diff --git a/Packages/Kernel_23/changes.txt b/Packages/Kernel_23/changes.txt index d9c58427426..94c5c1a5167 100644 --- a/Packages/Kernel_23/changes.txt +++ b/Packages/Kernel_23/changes.txt @@ -1,3 +1,7 @@ +1.16 (17 January 2003) +- Add CGAL/LEDA_basic.h at the beginning, otherwise the dirty LEDA macros add + a non-consistent mess. + 1.15 (15 January 2003) - docs added for the kernel archetype - some names changed for the kernel archetype diff --git a/Packages/Kernel_23/include/CGAL/basic.h b/Packages/Kernel_23/include/CGAL/basic.h index e66a4308744..131fd091ea2 100644 --- a/Packages/Kernel_23/include/CGAL/basic.h +++ b/Packages/Kernel_23/include/CGAL/basic.h @@ -39,11 +39,12 @@ # define CGAL_BIG_ENDIAN 1 #endif -#ifndef CGAL_USE_LEDA -# define CGAL_USE_CGAL_WINDOW -#else +#ifdef CGAL_USE_LEDA +# include // The following is needed for LEDA 4.4 due to min/max problems... # define LEDA_NO_MIN_MAX_TEMPL +#else +# define CGAL_USE_CGAL_WINDOW #endif #include