move assignments out of assert() in editor_drag (thanks lincoln); change mouse mode...

[ardour.git] / gtk2_ardour / canvas-imageframe.h

diff --git a/gtk2_ardour/canvas-imageframe.h b/gtk2_ardour/canvas-imageframe.h
index 48c981cb3636fe60e81b79c3c979179f9f860cf8..7c66c5e1dba27d78d1a274b5125cf35e6b1addf0 100644 (file)
--- a/gtk2_ardour/canvas-imageframe.h
+++ b/gtk2_ardour/canvas-imageframe.h
@@ -17,10 +17,14 @@
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <gtk/gtkenums.h> 
 
+#ifdef __cplusplus
 extern "C" {
-/* some versions of libart contain functions not inside an extern C block */
+#endif
 #include <libart_lgpl/art_misc.h>
+#ifdef __cplusplus
 }
+#endif
+
 #include <libart_lgpl/art_pixbuf.h>