Fix include and compiler warning

diff --git a/src/Scripting/ClipboardX11.cxx b/src/Scripting/ClipboardX11.cxx
index 5e005011cc5db625c7670f82fdd54e191923ee12..c8747863b74521e90cac3601da2a0ea95d82ad38 100644 (file)
--- a/src/Scripting/ClipboardX11.cxx
+++ b/src/Scripting/ClipboardX11.cxx
@@ -308,7 +308,8 @@ class ClipboardX11:
     struct Property
     {
       unsigned char *data;
-      int format, num_items;
+      int format;
+      unsigned long num_items;
       Atom type;
     };
 

diff --git a/src/Scripting/NasalCanvas.cxx b/src/Scripting/NasalCanvas.cxx
index 2d14dea30b766e0e3af1954a1832b478173d5513..08f7b9b3c933d6079c8d24baadf03e64470cf1eb 100644 (file)
--- a/src/Scripting/NasalCanvas.cxx
+++ b/src/Scripting/NasalCanvas.cxx
@@ -34,7 +34,7 @@
 #include <simgear/sg_inlines.h>
 
 #include <simgear/canvas/Canvas.hxx>
-#include <simgear/canvas/elements/element.hxx>
+#include <simgear/canvas/elements/CanvasElement.hxx>
 
 static naRef canvasPrototype;
 static naRef elementPrototype;