OSX compile fixes.

This commit is contained in:
leo 2015-04-04 23:52:20 +00:00
parent d0c669fa8a
commit 86f89472ac
4 changed files with 3 additions and 22 deletions

View file

@ -90,7 +90,7 @@ typedef char GLchar;
#ifndef GL_ARB_debug_output #ifndef GL_ARB_debug_output
#define GL_ARB_debug_output 1 #define GL_ARB_debug_output 1
typedef void (APIENTRY *GLDEBUGPROCARB) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam); typedef void (APIENTRY *GLDEBUGARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);
#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242 #define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242
#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243 #define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243
#define GL_DEBUG_CALLBACK_FUNCTION_ARB 0x8244 #define GL_DEBUG_CALLBACK_FUNCTION_ARB 0x8244
@ -173,7 +173,7 @@ typedef unsigned int GLhandleARB;
// GL_ARB_debug_output // GL_ARB_debug_output
typedef void (APIENTRY *GLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); typedef void (APIENTRY *GLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
typedef void (APIENTRY *GLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); typedef void (APIENTRY *GLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
typedef void (APIENTRY *GLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const void *userParam); typedef void (APIENTRY *GLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGARBPROC callback, const void *userParam);
typedef GLuint (APIENTRY *GLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); typedef GLuint (APIENTRY *GLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
// GL_ARB_vertex_buffer_object // GL_ARB_vertex_buffer_object

View file

@ -10,6 +10,7 @@
#include "lc_model.h" #include "lc_model.h"
#include "lc_context.h" #include "lc_context.h"
#include "camera.h" #include "camera.h"
#include <locale.h>
PieceInfo::PieceInfo() PieceInfo::PieceInfo()
{ {

View file

@ -368,25 +368,6 @@ void String::MakeLower ()
*cp += 'a' - 'A'; *cp += 'a' - 'A';
} }
void String::MakeReverse ()
{
register char *h, *t;
h = m_pData;
t = m_pData + strlen (m_pData) - 1;
while (h < t)
{
register char c;
c = *h;
*h = *t;
h++;
*t = c;
t--;
}
}
void String::TrimRight () void String::TrimRight ()
{ {
for (char *s = m_pData + strlen (m_pData) - 1; s >= m_pData && isspace (*s); s--) for (char *s = m_pData + strlen (m_pData) - 1; s >= m_pData && isspace (*s); s--)

View file

@ -56,7 +56,6 @@ public:
// upper/lower/reverse conversion // upper/lower/reverse conversion
void MakeUpper(); void MakeUpper();
void MakeLower(); void MakeLower();
void MakeReverse();
// trimming whitespace (either side) // trimming whitespace (either side)
void TrimRight(); void TrimRight();