Compilation fixes from HEAD. [Pointed out by Olaf Hering]

diff --git a/NEWS b/NEWS
index 42e10896d62d868138f8e292743223a41c54074e..2ed40481ae905093c189987926d1553c07b4e024 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Changes in 1.6.4
 * UPD: afpd.8: Updated the option documentation. [Thomas Kaiser, Sebastian
   Rittau]
 * FIX: megatron: Fixed an uninitialized variable. [Olaf Hering]
+* FIX: Compilation issues. [Olaf Hering, Sebastian Rittau]
 
 Changes in 1.6.3
 ================

diff --git a/bin/megatron/hqx.c b/bin/megatron/hqx.c
index 40187bc243f858029c9c1b35eaff93278ec1aa4b..525764d803ff2b2fa6c6dde69a7f9496f37578fb 100644 (file)
--- a/bin/megatron/hqx.c
+++ b/bin/megatron/hqx.c
@@ -1,5 +1,5 @@
 /*
- * $Id: hqx.c,v 1.12 2002-04-29 01:52:49 morgana Exp $
+ * $Id: hqx.c,v 1.12.2.1 2003-08-09 14:35:25 srittau Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -28,6 +28,7 @@
 #include <netatalk/endian.h>
 
 #include "megatron.h"
+#include "nad.h"
 #include "hqx.h"
 
 #define HEXOUTPUT      0

diff --git a/bin/megatron/nad.h b/bin/megatron/nad.h
index 0e0332dfc99cf771bfe9c5e84cce8db50347cd45..014e942b91cbe977885a8e61873f201af61fa353 100644 (file)
--- a/bin/megatron/nad.h
+++ b/bin/megatron/nad.h
@@ -1,5 +1,5 @@
 /*
- * $Id: nad.h,v 1.2 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: nad.h,v 1.2.8.1 2003-08-09 14:35:25 srittau Exp $
  */
 
 #ifndef _NAD_H
@@ -15,4 +15,6 @@ int nad_read(int fork, char *forkbuf, int bufc);
 int nad_write(int fork, char *forkbuf, int bufc);
 int nad_close(int status);
 
+void select_charset(int options);
+
 #endif /* _NAD_H */