OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code

0024312: Compilation issues on OS X 10.9 Maverics SDK

Browse Source 
Update glext.h. Fix compiler errors.
This commit is contained in:
kgv 2013-11-02 18:51:57 +04:00 committed by abv
parent aa65144716
commit 9293178ba0
5 changed files with 9398 additions and 10094 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx
View File

@ -173,7 +173,7 @@ void BinLDrivers_DocumentStorageDriver::Write
#if defined(_DEBUG) || defined(DEB)
WriteMessage (anErrorStr + aMethStr +
"Problem with the file stream, rdstate="
+ anOS.rdstate());
+ (Standard_Integer )anOS.rdstate());
#else
TCollection_ExtendedString aStr =
anErrorStr + aMethStr + "Problem writing the file ";

2
src/InterfaceGraphic/InterfaceGraphic_Cocoa.hxx
View File

@ -35,6 +35,6 @@
#define EXPORT
#endif
#endif InterfaceGraphic_CocoaHeader
#endif // InterfaceGraphic_CocoaHeader
#endif // __APPLE__

2
src/OpenGl/OpenGl_Context.cxx
View File

@ -596,7 +596,7 @@ static void APIENTRY debugCallbackWrap(unsigned int theSource,
unsigned int theSeverity,
int /*theLength*/,
const char* theMessage,
void* theUserParam)
const void* theUserParam)
{
OpenGl_Context* aCtx = (OpenGl_Context* )theUserParam;
aCtx->PushMessage (theSource, theType, theId, theSeverity, theMessage);

19461
src/OpenGl/glext.h
View File

File diff suppressed because it is too large Load Diff

1
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -93,7 +93,6 @@
#endif
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
#include <Cocoa_Window.hxx>
#include <tk.h>
#else
#include <Xw_Window.hxx>
#include <X11/Xlib.h> /* contains some dangerous #defines such as Status, True etc. */