Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-12 06:29:58 +00:00
Code Issues Projects Releases Wiki Activity

Silence a number of clang compiler warnings on Linux

Browse Source
This commit is contained in:
Aaron Culliney 2014-10-25 08:44:21 -07:00
parent 737c780929
commit 551cc00781
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/mockingboard.c
View File

@ -238,12 +238,12 @@ static VOICE SSI263Voice[MAX_VOICES];
static VOICE SSI263Voice[MAX_VOICES] = {0}; static VOICE SSI263Voice[MAX_VOICES] = {0};
#endif #endif
static const int g_nNumEvents = 2;
#ifdef APPLE2IX #ifdef APPLE2IX
static pthread_cond_t mockingboard_cond = PTHREAD_COND_INITIALIZER; static pthread_cond_t mockingboard_cond = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t mockingboard_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t mockingboard_mutex = PTHREAD_MUTEX_INITIALIZER;
static uint8_t quit_event = false; static uint8_t quit_event = false;
#else #else
static const int g_nNumEvents = 2;
static HANDLE g_hSSI263Event[g_nNumEvents] = {NULL}; // 1: Phoneme finished playing, 2: Exit thread static HANDLE g_hSSI263Event[g_nNumEvents] = {NULL}; // 1: Phoneme finished playing, 2: Exit thread
static DWORD g_dwMaxPhonemeLen = 0; static DWORD g_dwMaxPhonemeLen = 0;
#endif #endif

2
src/display.c
View File

@ -27,7 +27,7 @@
static uint8_t vga_mem_page_0[SCANWIDTH*SCANHEIGHT]; static uint8_t vga_mem_page_0[SCANWIDTH*SCANHEIGHT];
static uint8_t vga_mem_page_1[SCANWIDTH*SCANHEIGHT]; static uint8_t vga_mem_page_1[SCANWIDTH*SCANHEIGHT];
A2Color colormap[256] = { 0 }; A2Color colormap[256] = { { 0 } };
uint8_t video__wider_font[0x8000]; uint8_t video__wider_font[0x8000];
uint8_t video__font[0x4000]; uint8_t video__font[0x4000];

2
src/interface.c
View File

@ -1613,6 +1613,6 @@ static void *interface_thread(void *current_key)
void c_interface_begin(int current_key) void c_interface_begin(int current_key)
{ {
pthread_t t = 0; pthread_t t = 0;
pthread_create(&t, NULL, (void *) &interface_thread, (void *)current_key); pthread_create(&t, NULL, (void *)&interface_thread, (void *)((__SWORD_TYPE)current_key));
} }

2
src/timing.c
View File

@ -339,7 +339,7 @@ void CpuCalcCycles(const unsigned long nExecutedCycles)
g_nCumulativeCycles += nCycles; g_nCumulativeCycles += nCycles;
// HACK FIXME TODO // HACK FIXME TODO
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "--Wshorten-64-to-32" #pragma clang diagnostic ignored "-Wshorten-64-to-32"
g_nCyclesExecuted = nExecutedCycles; g_nCyclesExecuted = nExecutedCycles;
#pragma clang diagnostic pop #pragma clang diagnostic pop
} }

3
src/video/glvideo.c
View File

@ -16,6 +16,7 @@
#include "video/renderer.h" #include "video/renderer.h"
#include "video_util/modelUtil.h" #include "video_util/modelUtil.h"
#include "video_util/matrixUtil.h"
#include "video_util/sourceUtil.h" #include "video_util/sourceUtil.h"
#ifdef __APPLE__ #ifdef __APPLE__
@ -726,7 +727,7 @@ void video_driver_init(void *fbo) {
#if defined(__APPLE__) #if defined(__APPLE__)
gldriver_init_common(); gldriver_init_common();
#elif USE_GLUT #elif USE_GLUT
gldriver_init_glut(fbo); gldriver_init_glut(defaultFBO);
#else #else
#error no working codepaths #error no working codepaths
#endif #endif

2
src/video_util/modelUtil.c
View File

@ -56,7 +56,7 @@ demoModel *mdlLoadModel(const char *filepathname) {
return NULL; return NULL;
} }
modelHeader header = { 0 }; modelHeader header = { { 0 } };
sizeRead = fread(&header, 1, sizeof(modelHeader), curFile); sizeRead = fread(&header, 1, sizeof(modelHeader), curFile);
if (sizeRead != sizeof(modelHeader)) { if (sizeRead != sizeof(modelHeader)) {
fclose(curFile); fclose(curFile);