diff options
| author | Daniel Elstner <danielk@openismus.com> | 2009-08-13 16:53:02 +0200 |
|---|---|---|
| committer | Jonathon Jongsma <jjongsma@gnome.org> | 2009-08-13 11:09:31 -0500 |
| commit | b6551397eadf8983174d51180ec1b8263848a792 (patch) | |
| tree | 72dc56b302ca5026ddade2b65de9ad41436d2db4 | |
| parent | cbed810a9b06b1ea4a89df4ec448e39ab7280682 (diff) | |
Fix left-over cairomm/cairommconfig.h includes
* cairomm/cairomm.h: Remove directory prefix from cairommconfig.h
include statement.
* cairomm/context.cc: Include <cmath> unconditionally instead of
conditionally including <math.h>.
* examples/surfaces/*.cc: ditto,
* examples/text/text-rotate.cc: ditto.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | cairomm/cairomm.h | 2 | ||||
| -rw-r--r-- | cairomm/context.cc | 4 | ||||
| -rw-r--r-- | examples/surfaces/image-surface.cc | 6 | ||||
| -rw-r--r-- | examples/surfaces/pdf-surface.cc | 6 | ||||
| -rw-r--r-- | examples/surfaces/ps-surface.cc | 6 | ||||
| -rw-r--r-- | examples/surfaces/svg-surface.cc | 6 | ||||
| -rw-r--r-- | examples/text/text-rotate.cc | 6 |
9 files changed, 24 insertions, 24 deletions
@@ -26,6 +26,7 @@ Makefile.in /config.status stamp-h? /cairommconfig.h +/cairomm-*.tar.* /MSVC_Net2005/cairomm/cairomm.rc /MSVC_Net2005/cairomm/cairommconfig.h @@ -1,5 +1,16 @@ 2009-08-13 Daniel Elstner <danielk@openismus.com> + Fix left-over cairomm/cairommconfig.h includes + + * cairomm/cairomm.h: Remove directory prefix from cairommconfig.h + include statement. + * cairomm/context.cc: Include <cmath> unconditionally instead of + conditionally including <math.h>. + * examples/surfaces/*.cc: ditto, + * examples/text/text-rotate.cc: ditto. + +2009-08-13 Daniel Elstner <danielk@openismus.com> + Review and clean up after build overhaul * autogen.sh: Pass --enable-maintainer-mode to ./configure since the diff --git a/cairomm/cairomm.h b/cairomm/cairomm.h index f8eaa3c..3600531 100644 --- a/cairomm/cairomm.h +++ b/cairomm/cairomm.h @@ -31,7 +31,7 @@ * */ -#include <cairomm/cairommconfig.h> +#include <cairommconfig.h> #include <cairomm/context.h> #include <cairomm/enums.h> #include <cairomm/exception.h> diff --git a/cairomm/context.cc b/cairomm/context.cc index 5997250..1549a21 100644 --- a/cairomm/context.cc +++ b/cairomm/context.cc @@ -29,9 +29,7 @@ #endif /* Solaris et. al. need math.h for M_PI too */ -#ifdef HAVE_MATH_H -# include <math.h> -#endif +#include <cmath> using namespace Cairo::Private; diff --git a/examples/surfaces/image-surface.cc b/examples/surfaces/image-surface.cc index 8423f2f..3a349f2 100644 --- a/examples/surfaces/image-surface.cc +++ b/examples/surfaces/image-surface.cc @@ -1,6 +1,6 @@ #include <string> #include <iostream> -#include <cairomm/cairommconfig.h> +#include <cairommconfig.h> #include <cairomm/context.h> #include <cairomm/surface.h> @@ -11,9 +11,7 @@ #define _USE_MATH_DEFINES #endif -#ifdef HAVE_MATH_H -# include <math.h> -#endif +#include <cmath> int main() { diff --git a/examples/surfaces/pdf-surface.cc b/examples/surfaces/pdf-surface.cc index a4114ed..a742918 100644 --- a/examples/surfaces/pdf-surface.cc +++ b/examples/surfaces/pdf-surface.cc @@ -1,6 +1,6 @@ #include <string> #include <iostream> -#include <cairomm/cairommconfig.h> +#include <cairommconfig.h> #include <cairomm/context.h> #include <cairomm/surface.h> @@ -11,9 +11,7 @@ #define _USE_MATH_DEFINES #endif -#ifdef HAVE_MATH_H -# include <math.h> -#endif +#include <cmath> int main() { diff --git a/examples/surfaces/ps-surface.cc b/examples/surfaces/ps-surface.cc index d6049d8..73d630d 100644 --- a/examples/surfaces/ps-surface.cc +++ b/examples/surfaces/ps-surface.cc @@ -1,6 +1,6 @@ #include <string> #include <iostream> -#include <cairomm/cairommconfig.h> +#include <cairommconfig.h> #include <cairomm/context.h> #include <cairomm/surface.h> @@ -11,9 +11,7 @@ #define _USE_MATH_DEFINES #endif -#ifdef HAVE_MATH_H -# include <math.h> -#endif +#include <cmath> int main() { diff --git a/examples/surfaces/svg-surface.cc b/examples/surfaces/svg-surface.cc index 5bab1dd..38f96c9 100644 --- a/examples/surfaces/svg-surface.cc +++ b/examples/surfaces/svg-surface.cc @@ -1,6 +1,6 @@ #include <string> #include <iostream> -#include <cairomm/cairommconfig.h> +#include <cairommconfig.h> #include <cairomm/context.h> #include <cairomm/surface.h> @@ -11,9 +11,7 @@ #define _USE_MATH_DEFINES #endif -#ifdef HAVE_MATH_H -# include <math.h> -#endif +#include <cmath> int main() { diff --git a/examples/text/text-rotate.cc b/examples/text/text-rotate.cc index 214ede1..530c2f7 100644 --- a/examples/text/text-rotate.cc +++ b/examples/text/text-rotate.cc @@ -18,7 +18,7 @@ #include <string> #include <iostream> -#include <cairomm/cairommconfig.h> +#include <cairommconfig.h> #include <cairomm/cairomm.h> /* M_PI is defined in math.h in the case of Microsoft Visual C++, and @@ -28,9 +28,7 @@ #define _USE_MATH_DEFINES #endif -#ifdef HAVE_MATH_H -# include <math.h> -#endif +#include <cmath> // This example is based on the C cairo example of the same name |