Merge branch 'maint'

* maint:
  Remove unsupported C99 style struct initializers in git-archive.
  Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
  Use ULONG_MAX rather than implicit cast of -1.

1 files changed, 0 insertions, 2 deletions

diff --git a/archive.h b/archive.h
index 16dcdb875c..6838dc788f 100644
--- a/archive.h
+++ b/archive.h
@@ -25,8 +25,6 @@ struct archiver {
 	parse_extra_args_fn_t parse_extra;
 };
 
-extern struct archiver archivers[];
-
 extern int parse_archive_args(int argc,
 			      const char **argv,
 			      struct archiver *ar);