diff options
| author | Tor Lillqvist <tml@novell.com> | 2006-02-07 11:24:53 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2006-02-07 11:24:53 +0000 |
| commit | 2e4ef092318f3a4500b43f084d6ebfa2f691ab71 (patch) | |
| tree | bea75fe12eefbb7f0f264b6837512af0c4ec9b61 | |
| parent | 47a9932944536e87ffabaa8208176628b7496be7 (diff) | |
| download | pango-2e4ef092318f3a4500b43f084d6ebfa2f691ab71.tar.gz | |
Initialise GError pointer to NULL. Use waitpid() only on Unix.
2006-02-07 Tor Lillqvist <tml@novell.com>
* examples/viewer-main.c (main): Initialise GError pointer to
NULL. Use waitpid() only on Unix.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | examples/viewer-main.c | 9 |
2 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2006-02-07 Tor Lillqvist <tml@novell.com> + * examples/viewer-main.c (main): Initialise GError pointer to + NULL. Use waitpid() only on Unix. + * pango-zip.sh.in: Drop the timestamp from the zipfile names. 2006-02-06 Behdad Esfahbod <behdad@gnome.org> diff --git a/examples/viewer-main.c b/examples/viewer-main.c index 377b625a..7823025b 100644 --- a/examples/viewer-main.c +++ b/examples/viewer-main.c @@ -24,11 +24,14 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <sys/wait.h> #include <glib.h> #include <glib/gstdio.h> +#ifdef G_OS_UNIX +#include <sys/wait.h> +#endif + #include "viewer.h" #include "renderdemo.h" @@ -123,7 +126,7 @@ main (int argc, int fd; FILE *stream; const gchar *display_argv[5] = {"display", "-title", "%s", "-"}; - GError *error; + GError *error = NULL; GPid pid; if (!view->save) @@ -140,7 +143,9 @@ main (int argc, stream = fdopen (fd, "wb"); view->save (instance, surface, stream, width, height); fclose (stream); +#ifdef G_OS_UNIX waitpid (pid, NULL, 0); +#endif g_spawn_close_pid (pid); } |