From 84c4b86da805cbd670f2d09b5f416686c774810d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 14 Apr 2007 08:31:40 +0000 Subject: [PATCH] Added an #include and extern "C" around X11ErrorHandling to prevent Solaris build errros --- src/osgViewer/GraphicsWindowX11.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/osgViewer/GraphicsWindowX11.cpp b/src/osgViewer/GraphicsWindowX11.cpp index 7be52d3fa..402d495ba 100644 --- a/src/osgViewer/GraphicsWindowX11.cpp +++ b/src/osgViewer/GraphicsWindowX11.cpp @@ -29,6 +29,8 @@ #include /* For CARD16 */ +#include + using namespace osgViewer; namespace osgViewer @@ -1085,6 +1087,9 @@ void GraphicsWindowX11::requestWarpPointer(float x,float y) getEventQueue()->mouseWarped(x,y); } +extern "C" +{ + int X11ErrorHandling(Display* display, XErrorEvent* event) { osg::notify(osg::NOTICE)<<"Got an X11ErrorHandling call display="<