suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for MacOSX

Browse Source
This commit is contained in:
wmayer 2012-10-28 15:05:28 +01:00
parent 3fa415584e
commit 60e09f127e
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
acinclude.m4
View File

@ -220,10 +220,11 @@ case $host_os in
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtNetwork.framework/Headers" QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtNetwork.framework/Headers"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtSvg.framework/Headers" QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtSvg.framework/Headers"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtXml.framework/Headers" QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtXml.framework/Headers"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtUiTools.framework/Headers"
# Separated flags # Separated flags
QT4_CORE_CXXFLAGS="-F$fc_qt4_frm -I$fc_qt4_frm/QtCore.framework/Headers" QT4_CORE_CXXFLAGS="-F$fc_qt4_frm -I$fc_qt4_frm/QtCore.framework/Headers"
# QtUiTools doesn't seem to be available as framework # QtUiTools doesn't seem to be available as framework
QT_CXXFLAGS="$QT_CXXFLAGS -I/usr/include/QtUiTools" #QT_CXXFLAGS="$QT_CXXFLAGS -I/usr/include/QtUiTools"
# QtWebKit check # QtWebKit check
fc_ac_save_cppflags=$CPPFLAGS fc_ac_save_cppflags=$CPPFLAGS
CPPFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtWebKit.framework/Headers" CPPFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtWebKit.framework/Headers"

34
src/Base/Stream.h
View File

@ -25,6 +25,10 @@
#define BASE_STREAM_H #define BASE_STREAM_H
#ifdef __GNUC__
# include <stdint.h>
#endif
#include <fstream> #include <fstream>
#include <ios> #include <ios>
#include <iostream> #include <iostream>
@ -233,21 +237,21 @@ protected:
static const int bufSize = 1024; // size of the data buffer static const int bufSize = 1024; // size of the data buffer
char buffer[bufSize+pbSize]; // data buffer char buffer[bufSize+pbSize]; // data buffer
}; };
class BaseExport PyStreambuf : public std::streambuf class BaseExport PyStreambuf : public std::streambuf
{ {
public: public:
PyStreambuf(PyObject* o); PyStreambuf(PyObject* o);
protected: protected:
int underflow(); int underflow();
private: private:
static const int pbSize = 4; static const int pbSize = 4;
static const int bufSize = 1024; static const int bufSize = 1024;
char buffer[bufSize+pbSize]; char buffer[bufSize+pbSize];
PyObject* inp; PyObject* inp;
}; };
class BaseExport Streambuf : public std::streambuf class BaseExport Streambuf : public std::streambuf
{ {