diff options
author | Elliot Lee <sopwith@src.gnome.org> | 1999-10-21 05:43:06 +0000 |
---|---|---|
committer | Elliot Lee <sopwith@src.gnome.org> | 1999-10-21 05:43:06 +0000 |
commit | 80c965881aee496a1bdea9f3954d8e2c3b8ca2a0 (patch) | |
tree | 029d44c20d5aebb842cc1456dcf88b2ba898be02 | |
parent | b43b09c86486c9c417507e71e8e1323a57c50fa3 (diff) | |
download | nautilus-80c965881aee496a1bdea9f3954d8e2c3b8ca2a0.tar.gz |
Merges from stable - warning fixes, plus handling of ghelp:/filepath urls.POST_1_0_MERGEGNOME_CORE_1_1_0
Merges from stable - warning fixes, plus handling of ghelp:/filepath urls.
3 files changed, 4 insertions, 4 deletions
diff --git a/components/help/converters/gnome-info2html2/Makefile.am b/components/help/converters/gnome-info2html2/Makefile.am index 982f20d26..d6c7d56bd 100644 --- a/components/help/converters/gnome-info2html2/Makefile.am +++ b/components/help/converters/gnome-info2html2/Makefile.am @@ -14,6 +14,4 @@ bin_PROGRAMS = gnome-info2html gnome_info2html_SOURCES = main.c parse.c utils.c html.c data.h html.h parse.h utils.h version.h -CFLAGS += -Wall - diff --git a/components/help/converters/gnome-man2html2/Makefile.am b/components/help/converters/gnome-man2html2/Makefile.am index 7da5999df..51430b1db 100644 --- a/components/help/converters/gnome-man2html2/Makefile.am +++ b/components/help/converters/gnome-man2html2/Makefile.am @@ -11,5 +11,5 @@ bin_PROGRAMS = gnome-man2html gnome_man2html_SOURCES = gnome-man2html.c -CFLAGS += -Wall +#CFLAGS += -Wall diff --git a/components/help/converters/gnome-man2html2/gnome-man2html.c b/components/help/converters/gnome-man2html2/gnome-man2html.c index 3a116f41c..f3aa97dc8 100644 --- a/components/help/converters/gnome-man2html2/gnome-man2html.c +++ b/components/help/converters/gnome-man2html2/gnome-man2html.c @@ -3621,7 +3621,7 @@ static char return ret; } -void +int main(int argc, char **argv) { char *t=NULL; @@ -3718,4 +3718,6 @@ main(int argc, char **argv) if (buf) free(buf); + + return 0; } |