r14522 by jghali - several fixes for win32 compilation
scribus-commit
scribus-commit at lists.scribus.net
Fri Jan 15 01:25:22 CET 2010
Revision: 14522
Author: jghali
Date: 2010-01-14T10:48:09.181145Z
Commit message: several fixes for win32 compilation
Changeset:
M /trunk/Scribus/scribus/prc/exportPRC.cpp
M /trunk/Scribus/scribus/pageitem_osgframe.cpp
M /trunk/Scribus/scribus/ui/AdapterWidget.cpp
Diffs:
Index: scribus/pageitem_osgframe.cpp
===================================================================
--- scribus/pageitem_osgframe.cpp (revision 14521)
+++ scribus/pageitem_osgframe.cpp (revision 14522)
@@ -23,6 +23,11 @@
#include "pageitem_osgframe.h"
+#if defined(_MSC_VER)
+#define _USE_MATH_DEFINES
+#endif
+#include <cmath>
+
#include <QDebug>
#include <osgDB/ReadFile>
#include <osgUtil/Optimizer>
Index: scribus/ui/AdapterWidget.cpp
===================================================================
--- scribus/ui/AdapterWidget.cpp (revision 14521)
+++ scribus/ui/AdapterWidget.cpp (revision 14522)
@@ -16,13 +16,17 @@
#include <osgViewer/ViewerEventHandlers>
#include <osgGA/TrackballManipulator>
+#include "scconfig.h"
+
#include <QtCore>
#include <QtGui>
#include <QtOpenGL>
#include <iostream>
#include <iomanip>
#include <fstream>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#include <cstdlib>
#include <cassert>
#include <string>
Index: scribus/prc/exportPRC.cpp
===================================================================
--- scribus/prc/exportPRC.cpp (revision 14521)
+++ scribus/prc/exportPRC.cpp (revision 14522)
@@ -16,10 +16,14 @@
#include <osg/Material>
#include <osgUtil/Optimizer>
+#include "scconfig.h"
+
#include <iostream>
#include <iomanip>
#include <fstream>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#include <cstdlib>
#include <string>
#include "exportPRC.h"
More information about the scribus-commit
mailing list