Commit 0b74a679 authored by Nicolai Hähnle's avatar Nicolai Hähnle
Browse files

Merge commit 'official/master'

parents 538874b4 1b0d963d
......@@ -39,6 +39,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
#elif defined(__MS__)
#include <sys/stat.h>
......
......@@ -36,6 +36,7 @@
#include "environ.h"
#include "lex.h"
#include "glutils.h"
#include <cstdlib>
#if defined(__X11__)
# include <dlfcn.h>
#endif
......
......@@ -37,6 +37,7 @@ using namespace std;
#include <iostream>
#include <string>
#include <vector>
#include <cstring>
#include <algorithm>
#include "options.h"
#include "environ.h"
......
......@@ -33,7 +33,9 @@
#include "tapi2.h"
#include <cassert>
#include <math.h>
#include <cstring>
#include <cstdlib>
#include <cmath>
namespace GLEAN {
......
......@@ -33,6 +33,7 @@
#include "rand.h"
#include "image.h"
#include <cmath>
#include <cstdlib>
#define ELEMENTS(ARRAY) (sizeof(ARRAY) / sizeof(ARRAY[0]))
......
......@@ -36,6 +36,8 @@
#include "image.h"
#include <cassert>
#include <cmath>
#include <cstdlib>
#include <cstring>
#ifdef GL_EXT_packed_depth_stencil
......
......@@ -41,6 +41,7 @@
#include "tfragprog1.h"
#include <cassert>
#include <cstring>
#include <cmath>
#include <math.h>
......
......@@ -33,7 +33,8 @@
#include "tglsl1.h"
#include <cassert>
#include <math.h>
#include <cstring>
#include <cmath>
namespace GLEAN {
......
......@@ -34,6 +34,7 @@
#include "rand.h"
#include "image.h"
#include <cmath>
#include <cstdlib>
namespace {
......
......@@ -35,7 +35,9 @@
#define GL_GLEXT_PROTOTYPES
#include "toccluqry.h"
#include <cassert>
#include <stdio.h>
#include <cstdlib>
#include <cstdio>
#include <cstring>
#include <cmath>
......
......@@ -42,6 +42,7 @@
// Author: Brian Paul (brianp@valinux.com) November 2000
#include "tpaths.h"
#include <cstdlib>
namespace GLEAN {
......
......@@ -36,7 +36,9 @@
#define GL_GLEXT_PROTOTYPES
#include "tpbo.h"
#include <cassert>
#include <math.h>
#include <cmath>
#include <cstdlib>
#include <cstring>
#include "timer.h"
namespace GLEAN
{
......
......@@ -30,6 +30,7 @@
#include "tpixelformats.h"
#include <cassert>
#include <cmath>
#include <cstdlib>
// Set to 1 to help debug test failures:
......
......@@ -43,7 +43,9 @@
#include "tpointsprite.h"
#include <cassert>
#include <cmath>
#include <stdio.h>
#include <cstring>
#include <cstdio>
#include <cstdlib>
namespace GLEAN {
......
......@@ -42,7 +42,8 @@
#include "ttexenv.h"
#include <cassert>
#include <stdio.h>
#include <cstdio>
#include <cstdlib>
#include <cmath>
namespace GLEAN {
......
......@@ -34,6 +34,7 @@
#include "rand.h"
#include <cassert>
#include <cmath>
#include <cstring>
#ifdef GL_EXT_texture_sRGB
......
......@@ -45,7 +45,8 @@
// Author: Brian Paul (brian.paul a t tungstengraphics.com) October 2004
#include <math.h>
#include <cmath>
#include <cstdlib>
#include "tvertattrib.h"
#include "glutils.h"
#include <cassert>
......
......@@ -34,7 +34,7 @@
#include "tvertprog1.h"
#include <cassert>
#include <cmath>
#include <math.h>
#include <cstring>
namespace GLEAN {
......
Markdown is supported
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