Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/67c1c65bf2ef7752c036563e4dda4bea064569b2
...commit
http://git.netsurf-browser.org/netsurf.git/commit/67c1c65bf2ef7752c036563e4dda4bea064569b2
...tree
http://git.netsurf-browser.org/netsurf.git/tree/67c1c65bf2ef7752c036563e4dda4bea064569b2
The branch, master has been updated
via 67c1c65bf2ef7752c036563e4dda4bea064569b2 (commit)
from 51c2d48096f8f53583422113508912b3243c48f0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=67c1c65bf2ef7752c036563e4dda4bea064569b2
commit 67c1c65bf2ef7752c036563e4dda4bea064569b2
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
attempt a different fix for amiga os 3 strtoull
diff --git a/utils/config.h b/utils/config.h
index 5678bea..a87f19b 100644
--- a/utils/config.h
+++ b/utils/config.h
@@ -67,6 +67,14 @@ char *strcasestr(const char *haystack, const char *needle);
char *strchrnul(const char *s, int c);
#endif
+/*
+ * amigaos3 declares this but does not have it in its actual library
+ */
+#define HAVE_STRTOULL
+#if !defined(__amigaos4__) && defined(__AMIGA__)
+#undef HAVE_STRTOULL
+#endif
+
#define HAVE_SYS_SELECT
#define HAVE_POSIX_INET_HEADERS
#if (defined(_WIN32))
diff --git a/utils/utils.c b/utils/utils.c
index c5c1529..b260f37 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -283,6 +283,19 @@ char *human_friendly_bytesize(unsigned long long int
bsize) {
}
+#ifndef HAVE_STRTOULL
+/**
+ * string to unsigned long long
+ *
+ */
+unsigned long long int _strtoull(const char *nptr, char **endptr, int base)
+{
+ return (unsigned long long int)strtoul(nptr, endptr, base);
+}
+
+#endif
+
+
#ifndef HAVE_STRCASESTR
/**
diff --git a/utils/utils.h b/utils/utils.h
index 31a86c6..3995071 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -75,10 +75,6 @@
#define ceilf(x) (float)ceil((double)x)
#endif
-#if !defined(__amigaos4__) && defined(__AMIGA__)
-#define strtoull(n,e,b) (unsigned long long int)strtoul(n,e,b)
-#endif
-
/**
* Calculate length of constant C string.
*
-----------------------------------------------------------------------
Summary of changes:
utils/config.h | 8 ++++++++
utils/utils.c | 13 +++++++++++++
utils/utils.h | 4 ----
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/utils/config.h b/utils/config.h
index 5678bea..a87f19b 100644
--- a/utils/config.h
+++ b/utils/config.h
@@ -67,6 +67,14 @@ char *strcasestr(const char *haystack, const char *needle);
char *strchrnul(const char *s, int c);
#endif
+/*
+ * amigaos3 declares this but does not have it in its actual library
+ */
+#define HAVE_STRTOULL
+#if !defined(__amigaos4__) && defined(__AMIGA__)
+#undef HAVE_STRTOULL
+#endif
+
#define HAVE_SYS_SELECT
#define HAVE_POSIX_INET_HEADERS
#if (defined(_WIN32))
diff --git a/utils/utils.c b/utils/utils.c
index c5c1529..b260f37 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -283,6 +283,19 @@ char *human_friendly_bytesize(unsigned long long int
bsize) {
}
+#ifndef HAVE_STRTOULL
+/**
+ * string to unsigned long long
+ *
+ */
+unsigned long long int _strtoull(const char *nptr, char **endptr, int base)
+{
+ return (unsigned long long int)strtoul(nptr, endptr, base);
+}
+
+#endif
+
+
#ifndef HAVE_STRCASESTR
/**
diff --git a/utils/utils.h b/utils/utils.h
index 31a86c6..3995071 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -75,10 +75,6 @@
#define ceilf(x) (float)ceil((double)x)
#endif
-#if !defined(__amigaos4__) && defined(__AMIGA__)
-#define strtoull(n,e,b) (unsigned long long int)strtoul(n,e,b)
-#endif
-
/**
* Calculate length of constant C string.
*
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
