Merge pull request #192 from pesco/compiler-fixes
merging this to see what Travis says
This commit is contained in:
commit
cc733ffb77
3 changed files with 16 additions and 2 deletions
|
|
@ -420,6 +420,12 @@ void h_lr_parse_start(HSuspendedParser *s)
|
|||
s->backend_state = engine;
|
||||
}
|
||||
|
||||
// cf. comment before run_trace in regex.c
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
|
||||
#pragma GCC diagnostic ignored "-Wclobbered"
|
||||
#endif
|
||||
bool h_lr_parse_chunk(HSuspendedParser* s, HInputStream *stream)
|
||||
{
|
||||
HLREngine *engine = s->backend_state;
|
||||
|
|
@ -457,6 +463,10 @@ bool h_lr_parse_chunk(HSuspendedParser* s, HInputStream *stream)
|
|||
*stream = engine->input;
|
||||
return !run; // done if engine no longer running
|
||||
}
|
||||
// Reenable -Wclobber
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
HParseResult *h_lr_parse_finish(HSuspendedParser *s)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ bool svm_stack_ensure_cap(HAllocator *mm__, HSVMContext *ctx, size_t addl) {
|
|||
* the second return; here, the only variables that could matter for
|
||||
* are arena and ctx (because they're referenced in "goto fail").
|
||||
*/
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
|
||||
#pragma GCC diagnostic ignored "-Wclobbered"
|
||||
|
|
@ -311,7 +311,7 @@ HParseResult *run_trace(HAllocator *mm__, HRVMProg *orig_prog, HRVMTrace *trace,
|
|||
return NULL;
|
||||
}
|
||||
// Reenable -Wclobber
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
#ifdef __OpenBSD__
|
||||
#define _BSD_SOURCE // to obtain asprintf/vasprintf
|
||||
#else
|
||||
#define _GNU_SOURCE // to obtain asprintf/vasprintf
|
||||
#endif
|
||||
#include "platform.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue