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

Remove compiler pragmas and silence a spurious assert

Browse Source
This commit is contained in:
Aaron Culliney 2014-06-14 12:13:49 -07:00
parent 1649419b39
commit 87a34d2d97
3 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/audio/mockingboard.c
View File

@ -85,14 +85,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# include <sys/io.h>
# endif
# if defined(__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wformat"
# elif defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wformat"
# endif
#else
#include "StdAfx.h"
#endif
@ -2254,10 +2246,3 @@ DWORD MB_SetSnapshot(SS_CARD_MOCKINGBOARD* pSS, DWORD dwSlot_unused)
#endif
}
#ifdef APPLE2IX
# if defined(__GNUC__)
# pragma GCC diagnostic pop
# elif defined(__clang__)
# pragma clang diagnostic pop
# endif
#endif

20
src/audio/soundcore.c
View File

@ -37,14 +37,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "audio/win-shim.h"
#if defined(__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wformat"
#elif defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wformat"
#endif
#else
#include "StdAfx.h"
#endif
@ -88,6 +80,11 @@ bool g_bDSAvailable = false;
#ifdef APPLE2IX
bool g_bDisableDirectSound = false;
FILE *g_fh = NULL;
__attribute__((constructor))
static void _init_soundcore() {
g_fh = error_log;
}
#endif
//-----------------------------------------------------------------------------
@ -863,10 +860,3 @@ void SysClk_StopTimer()
#endif
}
#ifdef APPLE2IX
# if defined(__GNUC__)
# pragma GCC diagnostic pop
# elif defined(__clang__)
# pragma clang diagnostic pop
# endif
#endif

19
src/audio/speaker.c
View File

@ -36,14 +36,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# include <sys/io.h>
# endif
# if defined(__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wformat"
# elif defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wunused-variable"
# endif
#else
#include "StdAfx.h"
#endif
@ -515,7 +507,11 @@ static void ReinitRemainderBuffer(UINT nCyclesRemaining)
for(g_nRemainderBufferIdx=0; (g_nRemainderBufferIdx<nCyclesRemaining) && (g_nRemainderBufferIdx<g_nRemainderBufferSize); g_nRemainderBufferIdx++)
g_pRemainderBuffer[g_nRemainderBufferIdx] = g_nSpeakerData;
#ifdef APPLE2IX
// believe this is a erroneous (comparison should be <=) but ultimately spurious assert
#else
_ASSERT(g_nRemainderBufferIdx < g_nRemainderBufferSize);
#endif
}
static void UpdateRemainderBuffer(ULONG* pnCycleDiff)
@ -1341,10 +1337,3 @@ DWORD SpkrSetSnapshot(SS_IO_Speaker* pSS)
return 0;
}
#ifdef APPLE2IX
# if defined(__GNUC__)
# pragma GCC diagnostic pop
# elif defined(__clang__)
# pragma clang diagnostic pop
# endif
#endif