From fa8a31740f382291707d1fb76783bb4ca1ce2b98 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <j@uriah.heep.sax.de>
Date: Mon, 10 Jan 2022 14:27:08 +0100
Subject: [PATCH 1/3] Remove ac_cfg.h from libavrdude.h

---
 src/libavrdude.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/libavrdude.h b/src/libavrdude.h
index 40b49b53..0a72f678 100644
--- a/src/libavrdude.h
+++ b/src/libavrdude.h
@@ -21,9 +21,6 @@
 #ifndef libavrdude_h
 #define libavrdude_h
 
-/* XXX should go away */
-#include "ac_cfg.h"
-
 #include <stdio.h>
 #include <limits.h>
 #include <stdbool.h>

From cf35b7fe328093424fbbbf909821c0dd1dc49219 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <j@uriah.heep.sax.de>
Date: Mon, 10 Jan 2022 14:51:48 +0100
Subject: [PATCH 2/3] Include ac_cfg.h before libavrdude.h

On MSVC, this is required in order to have a definition of
PATH_MAX in place.
---
 src/lexer.l  | 1 +
 src/update.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/lexer.l b/src/lexer.l
index 6e930a1e..2e27a5d4 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include "ac_cfg.h"
 #include "avrdude.h"
 #include "libavrdude.h"
 #include "config.h"
diff --git a/src/update.c b/src/update.c
index 95e1028f..5f00d32d 100644
--- a/src/update.c
+++ b/src/update.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "ac_cfg.h"
 #include "avrdude.h"
 #include "libavrdude.h"
 

From 48bcc269e2576f9d7c6c356ed4cbaf321da9e57f Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <j@uriah.heep.sax.de>
Date: Mon, 10 Jan 2022 14:27:08 +0100
Subject: [PATCH 3/3] Remove ac_cfg.h from libavrdude.h

---
 src/avrpart.c | 1 +
 src/confwin.c | 1 +
 src/pindefs.c | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/avrpart.c b/src/avrpart.c
index 4ebd4eef..3f2461ef 100644
--- a/src/avrpart.c
+++ b/src/avrpart.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "ac_cfg.h"
 #include "avrdude.h"
 #include "libavrdude.h"
 
diff --git a/src/confwin.c b/src/confwin.c
index 9624947f..06f18e20 100644
--- a/src/confwin.c
+++ b/src/confwin.c
@@ -17,6 +17,7 @@
  */
 
 
+#include "ac_cfg.h"
 #include "avrdude.h"
 #include "libavrdude.h"
 
diff --git a/src/pindefs.c b/src/pindefs.c
index 5acb33fd..63ae295a 100644
--- a/src/pindefs.c
+++ b/src/pindefs.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "ac_cfg.h"
 #include "avrdude.h"
 #include "libavrdude.h"