65 lines
2.0 KiB
Plaintext
65 lines
2.0 KiB
Plaintext
From b548f2d39f844eb8cba348b9d167635e99cc04e2 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
|
Date: Wed, 23 Jul 2014 22:29:50 +0200
|
|
Subject: [PATCH 1/2] Use gcc2 zero-length array member
|
|
|
|
gcc2 doesn't support C99 flexible array member.
|
|
---
|
|
bzrlib/diff-delta.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/bzrlib/diff-delta.c b/bzrlib/diff-delta.c
|
|
index 0801c96..20aa9f2 100644
|
|
--- a/bzrlib/diff-delta.c
|
|
+++ b/bzrlib/diff-delta.c
|
|
@@ -24,6 +24,12 @@
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
+# if defined(__GNUC__) && (__GNUC__ < 3)
|
|
+#define FLEX_ARRAY_LEN 0
|
|
+#else
|
|
+#define FLEX_ARRAY_LEN
|
|
+#endif
|
|
+
|
|
/* maximum hash entry list for the same hash bucket */
|
|
#define HASH_LIMIT 64
|
|
|
|
@@ -151,7 +157,7 @@ struct delta_index {
|
|
entry */
|
|
unsigned int num_entries; /* The total number of entries in this index */
|
|
struct index_entry *last_entry; /* Pointer to the last valid entry */
|
|
- struct index_entry *hash[];
|
|
+ struct index_entry *hash[FLEX_ARRAY_LEN];
|
|
};
|
|
|
|
static unsigned int
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From 296dc6b32944ccf5a56d6138617b24ae8a9b25d1 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
|
Date: Sat, 26 Jul 2014 15:06:44 +0200
|
|
Subject: [PATCH 2/2] Add default certificates location for Haiku
|
|
|
|
---
|
|
bzrlib/transport/http/_urllib2_wrappers.py | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/bzrlib/transport/http/_urllib2_wrappers.py b/bzrlib/transport/http/_urllib2_wrappers.py
|
|
index 6a8dabd..44d0a63 100644
|
|
--- a/bzrlib/transport/http/_urllib2_wrappers.py
|
|
+++ b/bzrlib/transport/http/_urllib2_wrappers.py
|
|
@@ -86,6 +86,7 @@ _ssl_ca_certs_known_locations = [
|
|
u"/usr/local/share/certs/ca-root-nss.crt", # FreeBSD
|
|
# XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25
|
|
u'/etc/openssl/certs/ca-certificates.crt', # Solaris
|
|
+ u'/boot/system/data/ssl/CARootCertificates.pem', # Haiku
|
|
]
|
|
def default_ca_certs():
|
|
if sys.platform == 'win32':
|
|
--
|
|
1.8.3.4
|
|
|