Fix various header freestanding issues
This commit is contained in:
parent
bdbd56c024
commit
fb5ae4e0bc
|
@ -6,10 +6,10 @@
|
||||||
*/
|
*/
|
||||||
/* prototypes for function calls between files within the OpenGL module */
|
/* prototypes for function calls between files within the OpenGL module */
|
||||||
|
|
||||||
#ifndef _INTERNAL_H_
|
#pragma once
|
||||||
#define _INTERNAL_H_
|
|
||||||
|
|
||||||
#include "ogl_init.h" // interface to OpenGL module
|
#include "ogl_init.h" // interface to OpenGL module
|
||||||
|
#include "gr.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
||||||
|
@ -68,5 +68,3 @@ extern void ogl_swap_buffers_internal(void);
|
||||||
//inline GLfloat PAL2Tb(int c);
|
//inline GLfloat PAL2Tb(int c);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // _INTERNAL_H_
|
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "fwdvalptridx.h"
|
#include "fwdvalptridx.h"
|
||||||
|
#include "compiler-array.h"
|
||||||
#include "compiler-static_assert.h"
|
#include "compiler-static_assert.h"
|
||||||
#include "compiler-type_traits.h"
|
#include "compiler-type_traits.h"
|
||||||
#include "pack.h"
|
#include "pack.h"
|
||||||
|
|
|
@ -40,7 +40,7 @@ extern void automap_clear_visited();
|
||||||
extern array<ubyte, MAX_SEGMENTS> Automap_visited;
|
extern array<ubyte, MAX_SEGMENTS> Automap_visited;
|
||||||
|
|
||||||
#if defined(DXX_BUILD_DESCENT_II)
|
#if defined(DXX_BUILD_DESCENT_II)
|
||||||
#include "objnum.h"
|
#include "fwdobject.h"
|
||||||
#include "ntstring.h"
|
#include "ntstring.h"
|
||||||
#include "window.h"
|
#include "window.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue