- Better parsing of the "connect" command (tftp).

- Move missing header file stuff consistently into config.h.
- Make "make -j" work correctly.

1 files changed, 18 insertions, 2 deletions

diff --git a/config.h b/config.h
index 7585381..1230971 100644
--- a/config.h
+++ b/config.h
@@ -78,7 +78,6 @@
 #endif
 
 #include <setjmp.h>
-#include <netinet/in.h>
 #include <sys/socket.h>
 
 /* If we don't have intmax_t, try creating it */
@@ -172,7 +171,9 @@ typedef unsigned long u_long;
 #endif
 #endif
 
-/* Sometimes IPPORT_TFTP isn't defined */
+/* netinet/in.h, and possible missing pieces */
+
+#include <netinet/in.h>
 
 #ifndef HAVE_IPPORT_TFTP_DEFINITION
 #ifndef IPPORT_TFTP
@@ -180,4 +181,19 @@ typedef unsigned long u_long;
 #endif
 #endif
 
+/* arpa/tftp.h, and possible missing pieces */
+
+#include <arpa/tftp.h>
+
+#ifndef OACK
+#define OACK 6
+#endif
+#ifndef EOPTNEG
+#define EOPTNEG 8
+#endif
+
+/* tftp-hpa version */
+
+#include "version.h"
+
 #endif