Commit 4e394cfe authored by Dave DeMarle's avatar Dave DeMarle
Browse files

Merge branch 'freetype-gcc-4-7' into release

Change-Id: Iad003a0d6fb9b85dd1abccdbd8adb4a7636b55a6
parents 5eb0cf0c b649c55c
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
// The embedded fonts // The embedded fonts
#include "fonts/vtkEmbeddedFonts.h" #include "fonts/vtkEmbeddedFonts.h"
#ifndef _MSC_VER
# include <stdint.h>
#endif
#ifdef FTGL_USE_NAMESPACE #ifdef FTGL_USE_NAMESPACE
using namespace ftgl; using namespace ftgl;
#endif #endif
......
...@@ -31,6 +31,9 @@ ...@@ -31,6 +31,9 @@
#include "fonts/vtkEmbeddedFonts.h" #include "fonts/vtkEmbeddedFonts.h"
#include <sys/stat.h> #include <sys/stat.h>
#ifndef _MSC_VER
# include <stdint.h>
#endif
#ifdef FTGL_USE_NAMESPACE #ifdef FTGL_USE_NAMESPACE
using namespace ftgl; using namespace ftgl;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment