summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliot Lee <sopwith@src.gnome.org>1999-10-21 05:43:06 +0000
committerElliot Lee <sopwith@src.gnome.org>1999-10-21 05:43:06 +0000
commit48bc886e643e27eafcc019fe210019bd9ecbdbe5 (patch)
treec9b27c20d0e95caa7d0c7d3569b734e58289df24
parent40c9d6964b921c80b63dfb62e5c14aad31a9f0fa (diff)
downloadyelp-48bc886e643e27eafcc019fe210019bd9ecbdbe5.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.
-rw-r--r--src/info2html/Makefile.am2
-rw-r--r--src/man2html/Makefile.am2
-rw-r--r--src/man2html/yelp-man2html.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/info2html/Makefile.am b/src/info2html/Makefile.am
index 982f20d2..d6c7d56b 100644
--- a/src/info2html/Makefile.am
+++ b/src/info2html/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/src/man2html/Makefile.am b/src/man2html/Makefile.am
index 7da5999d..51430b1d 100644
--- a/src/man2html/Makefile.am
+++ b/src/man2html/Makefile.am
@@ -11,5 +11,5 @@ bin_PROGRAMS = gnome-man2html
gnome_man2html_SOURCES = gnome-man2html.c
-CFLAGS += -Wall
+#CFLAGS += -Wall
diff --git a/src/man2html/yelp-man2html.c b/src/man2html/yelp-man2html.c
index 3a116f41..f3aa97dc 100644
--- a/src/man2html/yelp-man2html.c
+++ b/src/man2html/yelp-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;
}