AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-09 15:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make some older compilers a bit happier

Browse Source
This commit is contained in:
UnknownShadow200 2022-10-10 21:47:15 +11:00
parent 72eb5ed03e
commit 4578eb213c
7 changed files with 25 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Window_Win.c
View File

@ -124,8 +124,8 @@ static LRESULT CALLBACK Window_Procedure(HWND handle, UINT message, WPARAM wPara
case WM_WINDOWPOSCHANGED:
{
WINDOWPOS* pos = (WINDOWPOS*)lParam;
if (pos->hwnd != win_handle) break;
cc_bool sized = pos->cx != win_totalWidth || pos->cy != win_totalHeight;
if (pos->hwnd != win_handle) break;
GrabCursor();
RefreshWindowBounds();
@ -625,7 +625,6 @@ void Window_FreeFramebuffer(struct Bitmap* bmp) {
static cc_bool rawMouseInited, rawMouseSupported;
static void InitRawMouse(void) {
static const cc_string user32 = String_FromConst("USER32.DLL");
RAWINPUTDEVICE rid;
rawMouseSupported = _RegisterRawInputDevices && _GetRawInputData;
@ -680,6 +679,8 @@ static FP_SWAPINTERVAL wglSwapIntervalEXT;
static void GLContext_SelectGraphicsMode(struct GraphicsMode* mode) {
PIXELFORMATDESCRIPTOR pfd = { 0 };
int modeIndex;
pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR);
pfd.nVersion = 1;
pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER;
@ -693,7 +694,7 @@ static void GLContext_SelectGraphicsMode(struct GraphicsMode* mode) {
pfd.cBlueBits = mode->B;
pfd.cAlphaBits = mode->A;
int modeIndex = ChoosePixelFormat(win_DC, &pfd);
modeIndex = ChoosePixelFormat(win_DC, &pfd);
if (modeIndex == 0) { Logger_Abort("Requested graphics mode not available"); }
Mem_Set(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR));

8
src/_ftbitmap.c
View File

@ -18,11 +18,11 @@
#include "Core.h"
#ifdef CC_BUILD_FREETYPE
#include "freetype/ft2build.h"
#include FT_INTERNAL_DEBUG_H_FT
#include "freetype/ftdebug.h"
#include FT_BITMAP_H_FT
#include FT_IMAGE_H_FT
#include FT_INTERNAL_OBJECTS_H_FT
#include "freetype/ftbitmap.h"
#include "freetype/ftimage.h"
#include "freetype/ftobjs.h"
static

10
src/_ftglyph.c
View File

@ -30,12 +30,12 @@
#include "Core.h"
#ifdef CC_BUILD_FREETYPE
#include "freetype/ft2build.h"
#include FT_INTERNAL_DEBUG_H_FT
#include "freetype/ftdebug.h"
#include FT_GLYPH_H_FT
#include FT_OUTLINE_H_FT
#include FT_BITMAP_H_FT
#include FT_INTERNAL_OBJECTS_H_FT
#include "freetype/ftglyph.h"
#include "freetype/ftoutln.h"
#include "freetype/ftbitmap.h"
#include "freetype/ftobjs.h"
/*************************************************************************/
/* */

12
src/_ftinit.c
View File

@ -39,10 +39,10 @@
#include "Core.h"
#ifdef CC_BUILD_FREETYPE
#include "freetype/ft2build.h"
#include FT_CONFIG_CONFIG_H_FT
#include FT_INTERNAL_OBJECTS_H_FT
#include FT_INTERNAL_DEBUG_H_FT
#include FT_MODULE_H_FT
#include "freetype/ftconfig.h"
#include "freetype/ftobjs.h"
#include "freetype/ftdebug.h"
#include "freetype/ftmodapi.h"
/*************************************************************************/
@ -62,7 +62,7 @@
#define FT_USE_MODULE( type, x ) extern const type x;
#endif
#include FT_CONFIG_MODULES_H_FT
#include "freetype/ftmodule.h"
#undef FT_USE_MODULE
#define FT_USE_MODULE( type, x ) (const FT_Module_Class*)&(x),
@ -70,7 +70,7 @@
static
const FT_Module_Class* const ft_default_modules[] =
{
#include FT_CONFIG_MODULES_H_FT
#include "freetype/ftmodule.h"
0
};

10
src/_ftsynth.c
View File

@ -18,11 +18,11 @@
#include "Core.h"
#ifdef CC_BUILD_FREETYPE
#include "freetype/ft2build.h"
#include FT_SYNTHESIS_H_FT
#include FT_INTERNAL_DEBUG_H_FT
#include FT_INTERNAL_OBJECTS_H_FT
#include FT_OUTLINE_H_FT
#include FT_BITMAP_H_FT
#include "freetype/ftsynth.h"
#include "freetype/ftdebug.h"
#include "freetype/ftobjs.h"
#include "freetype/ftoutln.h"
#include "freetype/ftbitmap.h"
/*************************************************************************/

18
src/freetype/ftheader.h
View File

@ -108,7 +108,6 @@
*/
#ifndef FT_CONFIG_CONFIG_H
#define FT_CONFIG_CONFIG_H "ftconfig.h"
#define FT_CONFIG_CONFIG_H_FT "freetype/ftconfig.h"
#endif
@ -155,7 +154,6 @@
*/
#ifndef FT_CONFIG_MODULES_H
#define FT_CONFIG_MODULES_H "ftmodule.h"
#define FT_CONFIG_MODULES_H_FT "freetype/ftmodule.h"
#endif
/* */
@ -188,7 +186,6 @@
*
*/
#define FT_ERRORS_H "fterrors.h"
#define FT_ERRORS_H_FT "freetype/fterrors.h"
/*************************************************************************
@ -218,7 +215,6 @@
*
*/
#define FT_SYSTEM_H "ftsystem.h"
#define FT_SYSTEM_H_FT "freetype/ftsystem.h"
/*************************************************************************
@ -235,7 +231,6 @@
*
*/
#define FT_IMAGE_H "ftimage.h"
#define FT_IMAGE_H_FT "freetype/ftimage.h"
/*************************************************************************
@ -251,7 +246,6 @@
*
*/
#define FT_TYPES_H "fttypes.h"
#define FT_TYPES_H_FT "freetype/fttypes.h"
/*************************************************************************
@ -280,7 +274,6 @@
*
*/
#define FT_OUTLINE_H "ftoutln.h"
#define FT_OUTLINE_H_FT "freetype/ftoutln.h"
/*************************************************************************
@ -307,7 +300,6 @@
*
*/
#define FT_MODULE_H "ftmodapi.h"
#define FT_MODULE_H_FT "freetype/ftmodapi.h"
/*************************************************************************
@ -392,7 +384,6 @@
*
*/
#define FT_TYPE1_TABLES_H "t1tables.h"
#define FT_TYPE1_TABLES_H_FT "freetype/t1tables.h"
/*************************************************************************
@ -421,7 +412,6 @@
*
*/
#define FT_TRUETYPE_TABLES_H "tttables.h"
#define FT_TRUETYPE_TABLES_H_FT "freetype/tttables.h"
/*************************************************************************
@ -450,7 +440,6 @@
*
*/
#define FT_CID_H "ftcid.h"
#define FT_CID_H_FT "freetype/ftcid.h"
/*************************************************************************
@ -464,7 +453,6 @@
*
*/
#define FT_GLYPH_H "ftglyph.h"
#define FT_GLYPH_H_FT "freetype/ftglyph.h"
/*************************************************************************
@ -478,7 +466,6 @@
*
*/
#define FT_BITMAP_H "ftbitmap.h"
#define FT_BITMAP_H_FT "freetype/ftbitmap.h"
/*************************************************************************
@ -492,7 +479,6 @@
*
*/
#define FT_BBOX_H "ftbbox.h"
#define FT_BBOX_H_FT "freetype/ftbbox.h"
/*************************************************************************
@ -536,7 +522,6 @@
*
*/
#define FT_MULTIPLE_MASTERS_H "ftmm.h"
#define FT_MULTIPLE_MASTERS_H_FT "freetype/ftmm.h"
/*************************************************************************
@ -576,7 +561,6 @@
* FreeType~2 API which provides functions to stroke outline paths.
*/
#define FT_STROKER_H "ftstroke.h"
#define FT_STROKER_H_FT "freetype/ftstroke.h"
/*************************************************************************
@ -589,7 +573,6 @@
* FreeType~2 API which performs artificial obliquing and emboldening.
*/
#define FT_SYNTHESIS_H "ftsynth.h"
#define FT_SYNTHESIS_H_FT "freetype/ftsynth.h"
/*************************************************************************
@ -615,7 +598,6 @@
* cosines and arc tangents).
*/
#define FT_TRIGONOMETRY_H "fttrigon.h"
#define FT_TRIGONOMETRY_H_FT "freetype/fttrigon.h"
/*************************************************************************

16
src/freetype/psft.c
View File

@ -736,23 +736,7 @@
cf2_freeT1SeacComponent( PS_Decoder* decoder,
CF2_Buffer buf )
{
T1_Face face;
FT_Data data;
FT_ASSERT( decoder );
#ifdef FT_CONFIG_OPTION_INCREMENTAL
face = (T1_Face)decoder->builder.face;
data.pointer = buf->start;
data.length = (FT_Int)( buf->end - buf->start );
if ( face->root.internal->incremental_interface )
face->root.internal->incremental_interface->funcs->free_glyph_data(
face->root.internal->incremental_interface->object,
&data );
#endif /* FT_CONFIG_OPTION_INCREMENTAL */
}