From e3e90d469241ceb7c577e13a908c0928646fed0a Mon Sep 17 00:00:00 2001 From: Abel `00z' Camarillo <00z@the00z.org> Date: Sun, 24 May 2009 21:02:13 -0500 Subject: s/stdout/_stdout/g I really think that stdout should not be used has a variable name. --- uzbl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uzbl.c b/uzbl.c index 0b59d5c..c9a9bab 100644 --- a/uzbl.c +++ b/uzbl.c @@ -905,7 +905,7 @@ sharg_append(GArray *a, const gchar *str) { // make sure that the args string you pass can properly be interpreted (eg properly escaped against whitespace, quotes etc) static gboolean run_command (const gchar *command, const guint npre, const gchar **args, - const gboolean sync, char **stdout) { + const gboolean sync, char **_stdout) { //command [args] GError *err = NULL; @@ -929,10 +929,10 @@ run_command (const gchar *command, const guint npre, const gchar **args, gboolean result; if (sync) { - if (*stdout) *stdout = strfree(*stdout); + if (*_stdout) *_stdout = strfree(*_stdout); result = g_spawn_sync(NULL, (gchar **)a->data, NULL, G_SPAWN_SEARCH_PATH, - NULL, NULL, stdout, NULL, NULL, &err); + NULL, NULL, _stdout, NULL, NULL, &err); } else result = g_spawn_async(NULL, (gchar **)a->data, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err); -- cgit v1.2.3 From b8af1378d2c75e9062eea69918f164c177c8f8ff Mon Sep 17 00:00:00 2001 From: Abel `00z' Camarillo <00z@the00z.org> Date: Sun, 24 May 2009 21:02:55 -0500 Subject: s/stdout/_stdout/g on uzbl.h --- uzbl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uzbl.h b/uzbl.h index 417df70..74b36fe 100644 --- a/uzbl.h +++ b/uzbl.h @@ -283,7 +283,7 @@ close_uzbl (WebKitWebView *page, GArray *argv); static gboolean run_command(const gchar *command, const guint npre, - const gchar **args, const gboolean sync, char **stdout); + const gchar **args, const gboolean sync, char **_stdout); static void spawn(WebKitWebView *web_view, GArray *argv); -- cgit v1.2.3 From abec4c22eae603c70670e015111c854000beb638 Mon Sep 17 00:00:00 2001 From: Abel `00z' Camarillo <00z@the00z.org> Date: Sun, 24 May 2009 21:03:17 -0500 Subject: uzbl now builds on OpenBSD --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d158a9b..acb7ad7 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" -LDFLAGS=$(shell pkg-config --libs gtk+-2.0 webkit-1.0) +CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" +LDFLAGS=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4) -pthread all: uzbl uzblctrl test: uzbl -- cgit v1.2.3