Skip to content
Snippets Groups Projects
Commit c656918e authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'netsurf-uname' into 'master'

netsurf: Remove uname patches

See merge request !183
parents 0c47839c ea0c3a87
No related branches found
No related tags found
1 merge request!183netsurf: Remove uname patches
...@@ -281,64 +281,3 @@ diff -rupNw source-original/netsurf/render/form.c source/netsurf/render/form.c ...@@ -281,64 +281,3 @@ diff -rupNw source-original/netsurf/render/form.c source/netsurf/render/form.c
0, &ret); 0, &ret);
if (err == NSERROR_BAD_ENCODING) { if (err == NSERROR_BAD_ENCODING) {
/* and without transliteration */ /* and without transliteration */
diff -rupNw source-original/netsurf/utils/log.c source/netsurf/utils/log.c
--- source-original/netsurf/utils/log.c 2017-10-16 12:09:36.000000000 +0200
+++ source/netsurf/utils/log.c 2018-03-04 20:43:18.252957604 +0100
@@ -261,18 +261,18 @@ nserror nslog_init(nslog_ensure_t *ensur
/* sucessfull logging initialisation so log system info */
if (ret == NSERROR_OK) {
NSLOG(netsurf, INFO, "NetSurf version '%s'", netsurf_version);
- if (uname(&utsname) < 0) {
+ //if (uname(&utsname) < 0) {
NSLOG(netsurf, INFO,
"Failed to extract machine information");
- } else {
- NSLOG(netsurf, INFO,
- "NetSurf on <%s>, node <%s>, release <%s>, version <%s>, machine <%s>",
- utsname.sysname,
- utsname.nodename,
- utsname.release,
- utsname.version,
- utsname.machine);
- }
+ //} else {
+ // NSLOG(netsurf, INFO,
+ // "NetSurf on <%s>, node <%s>, release <%s>, version <%s>, machine <%s>",
+ // utsname.sysname,
+ // utsname.nodename,
+ // utsname.release,
+ // utsname.version,
+ // utsname.machine);
+ //}
}
return ret;
diff -rupNw source-original/netsurf/utils/useragent.c source/netsurf/utils/useragent.c
--- source-original/netsurf/utils/useragent.c 2017-10-16 12:09:36.000000000 +0200
+++ source/netsurf/utils/useragent.c 2018-03-04 20:43:18.252957604 +0100
@@ -44,9 +44,10 @@ user_agent_build_string(void)
char *ua_string;
int len;
- if (uname(&un) >= 0) {
- sysname = un.sysname;
- }
+ //if (uname(&un) >= 0) {
+ // sysname = un.sysname;
+ //}
+ sysname = "Redox";
len = snprintf(NULL, 0, NETSURF_UA_FORMAT_STRING,
netsurf_version_major,
diff -rupNw source-original/netsurf/utils/utsname.h source/netsurf/utils/utsname.h
--- source-original/netsurf/utils/utsname.h 2017-10-16 12:09:36.000000000 +0200
+++ source/netsurf/utils/utsname.h 2018-03-04 20:43:18.252957604 +0100
@@ -24,7 +24,7 @@
#ifndef _NETSURF_UTILS_UTSNAME_H_
#define _NETSURF_UTILS_UTSNAME_H_
-#ifdef HAVE_UTSNAME
+#if 0
#include <sys/utsname.h>
#else
/** system information filled in by uname derived from posix spec. */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment