4 files changed, 1 insertions, 26 deletions
diff --git a/include/events.h b/include/events.h
index ec8e04c78..42f2c03d0 100644
--- a/include/events.h
+++ b/include/events.h
@@ -33,7 +33,6 @@
 #define EVENT_CHAN_FORBIDDEN "chan_forbidden"
 #define EVENT_CHAN_SUSPENDED "chan_suspended"
 #define EVENT_CHAN_UNSUSPEND "chan_unsuspend"
-#define EVENT_CHAN_KICK "chan_kicked"
 #define EVENT_CONNECT "connect"
 #define EVENT_DB_EXPIRE "db_expire"
 #define EVENT_RESTART "restart"
diff --git a/include/extern.h b/include/extern.h
index 645b57499..90c01744e 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1343,24 +1343,4 @@ E void eventprintf(char *fmt, ...);
 E void event_process_hook(char *name, int argc, char **argv);
 E void send_event(char *name, int argc, ...);
 
-#ifndef va_copy
-# ifdef __va_copy
-#  define VA_COPY(DEST,SRC) __va_copy((DEST),(SRC))
-# else
-#  define VA_COPY(DEST, SRC) memcpy ((&DEST), (&SRC), sizeof(va_list))
-# endif
-#else
-# ifdef HAVE_VA_LIST_AS_ARRAY
-#   define VA_COPY(DEST,SRC) va_copy(*(DEST) = *(SRC))
-# else
-#   define VA_COPY(DEST, SRC) va_copy(DEST, SRC)
-# endif
-#endif
-
-#ifdef __STRICT_ANSI__
-#ifndef fileno
-int fileno(FILE *stream);
-#endif
-#endif
-
 #endif	/* EXTERN_H */
diff --git a/include/sysconf.h.in b/include/sysconf.h.in
index 7b6d77af4..370330ead 100644
--- a/include/sysconf.h.in
+++ b/include/sysconf.h.in
@@ -15,9 +15,6 @@
 /* "" */
 #undef HAVE_BACKTRACE
 
-/* "" */
-#undef HAVE_VA_LIST_AS_ARRAY
-
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
@@ -186,7 +183,6 @@ int vprintf(const char *format, va_list ap);
 int vfprintf(FILE *stream, const char *format, va_list ap);
 int vsprintf(char *str, const char *format, va_list ap);
 int vsnprintf(char *str, size_t size, const char *format, va_list ap);
-int mkstemp(char *template);
 
 FILE *popen(const char *command, const char *type);
 int pclose(FILE *stream);
diff --git a/include/version.sh.c b/include/version.sh.c
index 77239b3b2..bf2bac91d 100644
--- a/include/version.sh.c
+++ b/include/version.sh.c
@@ -219,5 +219,5 @@ void parse_line(FILE * fd, char *line)
         } else
             fputc(*c, fd);
     }
-    fprintf(fd, "\n");
+    fprintf(fd, "\r\n");
 }