libavrdude.h fixes and installation of libavrdude-avrintel.h

src/CMakeLists.txt

@@ -278,7 +278,7 @@ add_library(libavrdude
 
 set_target_properties(libavrdude PROPERTIES
     PREFIX ""
-    PUBLIC_HEADER "libavrdude.h"
+    PUBLIC_HEADER "libavrdude.h;libavrdude-avrintel.h"
     VERSION 1.0.0
     SOVERSION 1
     )

src/Makefile.am

@@ -222,6 +222,7 @@ libavrdude_la_SOURCES = $(libavrdude_a_SOURCES)
 libavrdude_la_LDFLAGS = -version-info 1:0
 
 include_HEADERS = libavrdude.h
+include_HEADERS += libavrdude-avrintel.h
 
 avrdude_SOURCES = \
 	main.c \

src/libavrdude-avrintel.h

@@ -1,6 +1,9 @@
 /*
  * Do not edit: automatically generated by mkavrintel.pl
  *
+ * Do NOT directly "#include <libavrdude-avrintel.h>" into your code.
+ * DO "#include <libavrdude.h>" instead.
+ *
  * libavrdude-avrintel.h
  *
  * Microchip AVR8L, AVR8, XMEGA and AVR8X family description of interrupts, configurations and more

src/libavrdude.h

@@ -24,7 +24,13 @@
 #include <stdio.h>
 #include <limits.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
+
+#ifdef LIBAVRDUDE_INCLUDE_INTERNAL_HEADERS
+#error LIBAVRDUDE_INCLUDE_INTERNAL_HEADERS is defined. Do not do that.
+#endif
+
 #define LIBAVRDUDE_INCLUDE_INTERNAL_HEADERS
 #include "libavrdude-avrintel.h"
 #undef  LIBAVRDUDE_INCLUDE_INTERNAL_HEADERS
@@ -1103,11 +1109,11 @@ int avr_read(const PROGRAMMER * pgm, const AVRPART *p, const char *memstr, const
 int avr_write_page(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem,
                    unsigned long addr);
 
-unsigned long avr_ustimestamp();
+unsigned long avr_ustimestamp(void);
 
-unsigned long avr_mstimestamp();
+unsigned long avr_mstimestamp(void);
 
-double avr_timestamp();
+double avr_timestamp(void);
 
 int avr_write_byte(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem,
                    unsigned long addr, unsigned char data);
@@ -1476,7 +1482,7 @@ const char *str_plural(int x);
 const char *str_inname(const char *fn);
 const char *str_outname(const char *fn);
 const char *str_interval(int a, int b);
-bool is_bigendian();
+bool is_bigendian(void);
 void change_endian(void *p, int size);
 int memall(const void *p, char c, size_t n);
 unsigned long long int str_ull(const char *str, char **endptr, int base);
@@ -1506,7 +1512,7 @@ int terminal_mode(const PROGRAMMER *pgm, const AVRPART *p);
 int terminal_mode_noninteractive(const PROGRAMMER *pgm, const AVRPART *p);
 int terminal_line(const PROGRAMMER *pgm, const AVRPART *p, const char *line);
 char *terminal_get_input(const char *prompt);
-void terminal_setup_update_progress();
+void terminal_setup_update_progress(void);
 
 #ifdef __cplusplus
 }