Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/4372104e0e0637265609befd5e92bf7e2aeaa8b4
...commit
http://git.netsurf-browser.org/netsurf.git/commit/4372104e0e0637265609befd5e92bf7e2aeaa8b4
...tree
http://git.netsurf-browser.org/netsurf.git/tree/4372104e0e0637265609befd5e92bf7e2aeaa8b4
The branch, master has been updated
via 4372104e0e0637265609befd5e92bf7e2aeaa8b4 (commit)
via 872c3f5ef644bb3e8e0932897d7ce08acd18d16f (commit)
via 3232c85269d5abc9dc58d306e5b13bb1be217801 (commit)
from 5c9c1a70256dbb4ab14c0b07fc664384b076f87b (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=4372104e0e0637265609befd5e92bf7e2aeaa8b4
commit 4372104e0e0637265609befd5e92bf7e2aeaa8b4
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix utils configuration header ordering
diff --git a/content/handlers/html/html_css.c b/content/handlers/html/html_css.c
index eb80c0e..5550573 100644
--- a/content/handlers/html/html_css.c
+++ b/content/handlers/html/html_css.c
@@ -30,9 +30,9 @@
#include <strings.h>
#include <stdlib.h>
+#include "utils/config.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
-#include "utils/config.h"
#include "utils/log.h"
#include "netsurf/misc.h"
#include "netsurf/content.h"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=872c3f5ef644bb3e8e0932897d7ce08acd18d16f
commit 872c3f5ef644bb3e8e0932897d7ce08acd18d16f
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
Update utils configuration header to cope with serenity OS
diff --git a/utils/config.h b/utils/config.h
index ddd1c6e..2f393dd 100644
--- a/utils/config.h
+++ b/utils/config.h
@@ -23,14 +23,23 @@
/* Try to detect which features the target OS supports */
-#if (defined(_GNU_SOURCE) && !defined(__APPLE__) || defined(__amigaos4__) ||
defined(__HAIKU__) || (defined(_POSIX_C_SOURCE) && ((_POSIX_C_SOURCE - 0) >=
200809L)) && !defined(__riscos__))
+#if (defined(_GNU_SOURCE) && \
+ !defined(__APPLE__) || \
+ defined(__amigaos4__) || \
+ defined(__HAIKU__) || \
+ (defined(_POSIX_C_SOURCE) && ((_POSIX_C_SOURCE - 0) >= 200809L)) && \
+ !defined(__riscos__))
#define HAVE_STRNDUP
#else
#undef HAVE_STRNDUP
char *strndup(const char *s, size_t n);
#endif
-#if (defined(_GNU_SOURCE) || defined(__APPLE__) || defined(__HAIKU__) ||
defined(__OpenBSD__))
+#if (defined(_GNU_SOURCE) || \
+ defined(__APPLE__) || \
+ defined(__HAIKU__) || \
+ defined(__OpenBSD__) &&\
+ !defined(__serenity__))
#define HAVE_STRCASESTR
#else
#undef HAVE_STRCASESTR
@@ -134,8 +143,10 @@ char *realpath(const char *path, char *resolved_path);
#endif
/* amiga */
-#if defined(__amigaos4__) || defined(__AMIGA__) || \
- defined(nsatari)
+#if (defined(__amigaos4__) || \
+ defined(__AMIGA__) || \
+ defined(nsatari) || \
+ defined(__serenity__))
#define NO_IPV6
#endif
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=3232c85269d5abc9dc58d306e5b13bb1be217801
commit 3232c85269d5abc9dc58d306e5b13bb1be217801
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
add timer cmp,isset and clear to fallback macros and improve file
documentation
diff --git a/utils/sys_time.h b/utils/sys_time.h
index 82d88fd..fe8e5f6 100644
--- a/utils/sys_time.h
+++ b/utils/sys_time.h
@@ -18,14 +18,26 @@
/**
* \file
- * \brief BSD style time functions
+ * BSD style timeval macros
+ *
+ * BSD added macros for manipulating timeval which have become standard on
+ * modern c libraries but for compatability where they are missing it is
+ * necessary to provide fallbacks.
*/
-#ifndef _NETSURF_UTILS_SYS_TIME_H_
-#define _NETSURF_UTILS_SYS_TIME_H_
+#ifndef NETSURF_UTILS_SYS_TIME_H_
+#define NETSURF_UTILS_SYS_TIME_H_
#include <sys/time.h>
+#ifndef timerclear
+#define timerclear(a) (a)->tv_sec = (a)->tv_usec = 0
+#endif
+
+#ifndef timerisset
+#define timerisset(a) ((a)->tv_sec || (a)->tv_usec)
+#endif
+
#ifndef timeradd
#define timeradd(a, aa, result)
\
do { \
@@ -50,4 +62,10 @@
} while (0)
#endif
+#ifndef timercmp
+#define timercmp(a, aa, cmp) \
+ ((a)->tv_sec cmp (aa)->tv_sec || \
+ (a)->tv_sec == (aa)->tv_sec && (a)->tv_usec cmp (aa)->tv_usec)
+#endif
+
#endif
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/html_css.c | 2 +-
utils/config.h | 19 +++++++++++++++----
utils/sys_time.h | 24 +++++++++++++++++++++---
3 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/content/handlers/html/html_css.c b/content/handlers/html/html_css.c
index eb80c0e..5550573 100644
--- a/content/handlers/html/html_css.c
+++ b/content/handlers/html/html_css.c
@@ -30,9 +30,9 @@
#include <strings.h>
#include <stdlib.h>
+#include "utils/config.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
-#include "utils/config.h"
#include "utils/log.h"
#include "netsurf/misc.h"
#include "netsurf/content.h"
diff --git a/utils/config.h b/utils/config.h
index ddd1c6e..2f393dd 100644
--- a/utils/config.h
+++ b/utils/config.h
@@ -23,14 +23,23 @@
/* Try to detect which features the target OS supports */
-#if (defined(_GNU_SOURCE) && !defined(__APPLE__) || defined(__amigaos4__) ||
defined(__HAIKU__) || (defined(_POSIX_C_SOURCE) && ((_POSIX_C_SOURCE - 0) >=
200809L)) && !defined(__riscos__))
+#if (defined(_GNU_SOURCE) && \
+ !defined(__APPLE__) || \
+ defined(__amigaos4__) || \
+ defined(__HAIKU__) || \
+ (defined(_POSIX_C_SOURCE) && ((_POSIX_C_SOURCE - 0) >= 200809L)) && \
+ !defined(__riscos__))
#define HAVE_STRNDUP
#else
#undef HAVE_STRNDUP
char *strndup(const char *s, size_t n);
#endif
-#if (defined(_GNU_SOURCE) || defined(__APPLE__) || defined(__HAIKU__) ||
defined(__OpenBSD__))
+#if (defined(_GNU_SOURCE) || \
+ defined(__APPLE__) || \
+ defined(__HAIKU__) || \
+ defined(__OpenBSD__) &&\
+ !defined(__serenity__))
#define HAVE_STRCASESTR
#else
#undef HAVE_STRCASESTR
@@ -134,8 +143,10 @@ char *realpath(const char *path, char *resolved_path);
#endif
/* amiga */
-#if defined(__amigaos4__) || defined(__AMIGA__) || \
- defined(nsatari)
+#if (defined(__amigaos4__) || \
+ defined(__AMIGA__) || \
+ defined(nsatari) || \
+ defined(__serenity__))
#define NO_IPV6
#endif
diff --git a/utils/sys_time.h b/utils/sys_time.h
index 82d88fd..fe8e5f6 100644
--- a/utils/sys_time.h
+++ b/utils/sys_time.h
@@ -18,14 +18,26 @@
/**
* \file
- * \brief BSD style time functions
+ * BSD style timeval macros
+ *
+ * BSD added macros for manipulating timeval which have become standard on
+ * modern c libraries but for compatability where they are missing it is
+ * necessary to provide fallbacks.
*/
-#ifndef _NETSURF_UTILS_SYS_TIME_H_
-#define _NETSURF_UTILS_SYS_TIME_H_
+#ifndef NETSURF_UTILS_SYS_TIME_H_
+#define NETSURF_UTILS_SYS_TIME_H_
#include <sys/time.h>
+#ifndef timerclear
+#define timerclear(a) (a)->tv_sec = (a)->tv_usec = 0
+#endif
+
+#ifndef timerisset
+#define timerisset(a) ((a)->tv_sec || (a)->tv_usec)
+#endif
+
#ifndef timeradd
#define timeradd(a, aa, result)
\
do { \
@@ -50,4 +62,10 @@
} while (0)
#endif
+#ifndef timercmp
+#define timercmp(a, aa, cmp) \
+ ((a)->tv_sec cmp (aa)->tv_sec || \
+ (a)->tv_sec == (aa)->tv_sec && (a)->tv_usec cmp (aa)->tv_usec)
+#endif
+
#endif
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
