mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-13 15:20:07 +02:00
46 lines
1.3 KiB
Plaintext
46 lines
1.3 KiB
Plaintext
From 42928f5769cc98b8cd791dfa2c58f7dc0634dba5 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sun, 8 Jun 2014 19:35:53 +0200
|
|
Subject: Remove compiler options unknown to gcc2.
|
|
|
|
|
|
diff --git a/Makefile.am.inc b/Makefile.am.inc
|
|
index fec591b..21aec1f 100644
|
|
--- a/Makefile.am.inc
|
|
+++ b/Makefile.am.inc
|
|
@@ -1,2 +1,2 @@
|
|
-AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
|
|
+AM_CFLAGS = -Wall -Wwrite-strings -std=gnu9x -D_GNU_SOURCE -D_REENTRANT
|
|
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From d75281fd4c7e7b91913d25f3a2052221af50116e Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sun, 8 Jun 2014 21:08:43 +0200
|
|
Subject: Avoid c99ism to make gcc2 happy.
|
|
|
|
|
|
diff --git a/json_tokener.c b/json_tokener.c
|
|
index 19de8ef..80841f1 100644
|
|
--- a/json_tokener.c
|
|
+++ b/json_tokener.c
|
|
@@ -355,11 +355,12 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
|
|
int size;
|
|
int size_inf;
|
|
int is_negative = 0;
|
|
+ char* infbuf;
|
|
|
|
printbuf_memappend_fast(tok->pb, &c, 1);
|
|
size = json_min(tok->st_pos+1, json_null_str_len);
|
|
size_inf = json_min(tok->st_pos+1, json_inf_str_len);
|
|
- char *infbuf = tok->pb->buf;
|
|
+ infbuf = tok->pb->buf;
|
|
if (*infbuf == '-')
|
|
{
|
|
infbuf++;
|
|
--
|
|
1.8.3.4
|
|
|