Mercurial > urweb
changeset 1138:b7118ffd32ae
Update Makefile.in's with new Autotools; add extra 'return NULL' to placate some -Wall
| author | Adam Chlipala <adamc@hcoop.net> |
|---|---|
| date | Sat, 30 Jan 2010 11:21:26 -0500 |
| parents | a8921f5ef6bd |
| children | 398ed1b89ee7 |
| files | Makefile.in include/urweb.h lib/ur/basis.urs src/c/Makefile.in src/c/fastcgi.c src/c/http.c src/c/urweb.c |
| diffstat | 7 files changed, 20 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sat Jan 30 08:45:31 2010 -0500 +++ b/Makefile.in Sat Jan 30 11:21:26 2010 -0500 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -277,7 +277,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -302,7 +302,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -466,7 +466,8 @@ fi; \ done -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -510,17 +511,17 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac
--- a/include/urweb.h Sat Jan 30 08:45:31 2010 -0500 +++ b/include/urweb.h Sat Jan 30 11:21:26 2010 -0500 @@ -223,6 +223,7 @@ __attribute__((noreturn)) void uw_redirect(uw_context, uw_Basis_string url); uw_Basis_time uw_Basis_now(uw_context); +uw_Basis_time uw_Basis_minusSeconds(uw_context, uw_Basis_time, uw_Basis_int); extern const uw_Basis_time uw_Basis_minTime; void uw_register_transactional(uw_context, void *data, uw_callback commit, uw_callback rollback, uw_callback free);
--- a/lib/ur/basis.urs Sat Jan 30 08:45:31 2010 -0500 +++ b/lib/ur/basis.urs Sat Jan 30 11:21:26 2010 -0500 @@ -135,6 +135,7 @@ val now : transaction time val minTime : time +val minusSeconds : time -> int -> time (** HTTP operations *)
--- a/src/c/Makefile.in Sat Jan 30 08:45:31 2010 -0500 +++ b/src/c/Makefile.in Sat Jan 30 11:21:26 2010 -0500 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/src/c/fastcgi.c Sat Jan 30 08:45:31 2010 -0500 +++ b/src/c/fastcgi.c Sat Jan 30 11:21:26 2010 -0500 @@ -478,6 +478,8 @@ fastcgi_input_reset(in); uw_reset(ctx); } + + return NULL; } static void help(char *cmd) {
--- a/src/c/http.c Sat Jan 30 08:45:31 2010 -0500 +++ b/src/c/http.c Sat Jan 30 11:21:26 2010 -0500 @@ -210,6 +210,8 @@ done: uw_reset(ctx); } + + return NULL; } static void help(char *cmd) {
--- a/src/c/urweb.c Sat Jan 30 08:45:31 2010 -0500 +++ b/src/c/urweb.c Sat Jan 30 11:21:26 2010 -0500 @@ -3279,6 +3279,10 @@ return time(NULL); } +uw_Basis_time uw_Basis_minusSeconds(uw_context ctx, uw_Basis_time tm, uw_Basis_int n) { + return tm - n; +} + void *uw_get_global(uw_context ctx, char *name) { int i;