commit 06a71888f08cd838edef83e7cbd91492e25b903e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sat May 20 16:08:37 2023 +0200

    fix typo

commit ead0ec1c8902af4462989837ffe5336d6dcc7f12
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sat May 20 16:14:59 2023 +0200

    Fix build against reinforced build options

Index: hurd-debian/libddekit/condvar.c
===================================================================
--- hurd-debian.orig/libddekit/condvar.c
+++ hurd-debian/libddekit/condvar.c
@@ -13,7 +13,7 @@ struct ddekit_condvar {
 	pthread_cond_t cond;
 };
 
-ddekit_condvar_t *ddekit_condvar_init() {
+ddekit_condvar_t *ddekit_condvar_init(void) {
 	ddekit_condvar_t *cvp;
 
 	cvp = ddekit_simple_malloc (sizeof (*cvp));
Index: hurd-debian/libddekit/init.c
===================================================================
--- hurd-debian.orig/libddekit/init.c
+++ hurd-debian/libddekit/init.c
@@ -13,10 +13,10 @@ mach_port_t priv_host;
 
 void ddekit_init(void)
 {
-	extern void linux_kmem_init ();
-	extern int log_init ();
-	extern void interrupt_init ();
-	extern int pgtab_init ();
+	extern void linux_kmem_init (void);
+	extern int log_init (void);
+	extern void interrupt_init (void);
+	extern int pgtab_init (void);
 	error_t err;
 
 	err = get_privileged_ports (&priv_host, NULL);
Index: hurd-debian/libddekit/initcall.c
===================================================================
--- hurd-debian.orig/libddekit/initcall.c
+++ hurd-debian/libddekit/initcall.c
@@ -14,7 +14,7 @@ typedef void (*crt0_hook)(void);
 static crt0_hook __L4DDE_CTOR_BEG__[1] SECTION(".mark_beg_l4dde_ctors")	= BEG;
 static crt0_hook __l4DDE_CTOR_END__[1] SECTION(".mark_end_l4dde_ctors")	= END;
 
-void ddekit_do_initcalls() {
+void ddekit_do_initcalls(void) {
     crt0_hook *list = __L4DDE_CTOR_BEG__;
 
     list++;
Index: hurd-debian/libddekit/interrupt.c
===================================================================
--- hurd-debian.orig/libddekit/interrupt.c
+++ hurd-debian/libddekit/interrupt.c
@@ -272,7 +272,7 @@ void ddekit_interrupt_enable(int irq)
 	}
 }
 
-void interrupt_init ()
+void interrupt_init (void)
 {
 	error_t err;
 
Index: hurd-debian/libddekit/pgtab.c
===================================================================
--- hurd-debian.orig/libddekit/pgtab.c
+++ hurd-debian/libddekit/pgtab.c
@@ -205,7 +205,7 @@ void ddekit_pgtab_set_region_with_size(v
 	pthread_mutex_unlock (&lock);
 }
 
-int pgtab_init ()
+int pgtab_init (void)
 {
 	capability = INIT_SIZE;
 	regions = malloc (sizeof (struct entry) * capability);
Index: hurd-debian/libddekit/printf.c
===================================================================
--- hurd-debian.orig/libddekit/printf.c
+++ hurd-debian/libddekit/printf.c
@@ -73,7 +73,7 @@ int ddekit_vprintf(const char *fmt, va_l
 	return ret;
 }
 
-int log_init ()
+int log_init (void)
 {
 	if (&using_std && using_std) {
 		output = stderr;
@@ -96,7 +96,7 @@ int log_init ()
 	return 0;
 }
 
-void dump_stack()
+void dump_stack(void)
 {
 #define NUM_TRACES 16
 	void *trace[NUM_TRACES];
Index: hurd-debian/libddekit/resources.c
===================================================================
--- hurd-debian.orig/libddekit/resources.c
+++ hurd-debian/libddekit/resources.c
@@ -119,7 +119,7 @@ int ddekit_release_mem(ddekit_addr_t sta
 	return 0;
 }
 
-long ddekit_random ()
+long ddekit_random (void)
 {
 	return random ();
 }
Index: hurd-debian/libddekit/thread.c
===================================================================
--- hurd-debian.orig/libddekit/thread.c
+++ hurd-debian/libddekit/thread.c
@@ -39,7 +39,7 @@ struct ddekit_sem
 
 static __thread struct ddekit_thread *thread_self;
 
-static void _thread_cleanup ()
+static void _thread_cleanup (void)
 {
 	ddekit_condvar_deinit (thread_self->private->sleep_cond);
 	ddekit_simple_free (thread_self->private);
@@ -144,7 +144,7 @@ void *ddekit_thread_get_data(ddekit_thre
 	return thread->user;
 }
 
-void *ddekit_thread_get_my_data() {
+void *ddekit_thread_get_my_data(void) {
 	return ddekit_thread_get_data(ddekit_thread_myself());
 }
 
@@ -196,7 +196,7 @@ void  ddekit_thread_wakeup(ddekit_thread
 	ddekit_condvar_signal (td->private->sleep_cond);
 }
 
-void  ddekit_thread_exit() {
+void  ddekit_thread_exit(void) {
 	_thread_cleanup ();
 	pthread_exit (NULL);
 }
@@ -215,7 +215,7 @@ void ddekit_yield(void)
 	swtch_pri (0);
 }
 
-void ddekit_init_threads() {
+void ddekit_init_threads(void) {
 	ddekit_thread_setup_myself ("main");
 }
 
Index: hurd-debian/libddekit/timer.c
===================================================================
--- hurd-debian.orig/libddekit/timer.c
+++ hurd-debian/libddekit/timer.c
@@ -53,7 +53,7 @@ static void dump_list(char *msg)
 #endif
 }
 
-unsigned long fetch_jiffies ()
+unsigned long fetch_jiffies (void)
 {
   struct timeval tv;
   long long j;
@@ -311,7 +311,7 @@ static void ddekit_timer_thread(void *ar
 	// TODO how is the thread terminated?
 }
 
-ddekit_thread_t *ddekit_get_timer_thread()
+ddekit_thread_t *ddekit_get_timer_thread(void)
 {
 	return timer_thread_ddekit;
 }
Index: hurd-debian/libmachdevdde/ds_routines.c
===================================================================
--- hurd-debian.orig/libmachdevdde/ds_routines.c
+++ hurd-debian/libmachdevdde/ds_routines.c
@@ -23,6 +23,7 @@
 #include <hurd/machdev.h>
 
 #include "machdevdde.h"
+#include "mach_glue.h"
 
 
 void * machdevdde_server(void *arg)
Index: hurd-debian/libmachdevdde/mach_glue.h
===================================================================
--- hurd-debian.orig/libmachdevdde/mach_glue.h
+++ hurd-debian/libmachdevdde/mach_glue.h
@@ -9,7 +9,7 @@
 struct sk_buff;
 struct net_device;
 void skb_done_queue(struct sk_buff *skb);
-struct sk_buff *skb_done_dequeue();
+struct sk_buff *skb_done_dequeue(void);
 void *skb_reply(struct sk_buff *skb);
 
 int netdev_flags(struct net_device *dev);
@@ -28,7 +28,7 @@ struct net_device *search_netdev (const
 void kfree_skb (struct sk_buff *skb);
 int dev_open(struct net_device *dev);
 void *l4dde26_register_rx_callback(void *cb);
-void skb_done_head_init();
+void skb_done_head_init(void);
 
 /* block device */
 struct block_device;
Index: hurd-debian/libmachdevdde/net.c
===================================================================
--- hurd-debian.orig/libmachdevdde/net.c
+++ hurd-debian/libmachdevdde/net.c
@@ -146,7 +146,7 @@ static int
 pre_kfree_skb (struct sk_buff *skb, void *data)
 {
   struct skb_reply *reply = data;
-  extern void wakeup_io_done_thread ();
+  extern void wakeup_io_done_thread (void);
 
   /* Queue sk_buff on done list if there is a
      page list attached or we need to send a reply.
@@ -270,8 +270,7 @@ dev_to_port (void *nd)
 /*    
  * Initialize send and receive queues on an interface.
  */   
-void if_init_queues(ifp)
-     register struct ifnet *ifp;
+void if_init_queues(struct ifnet *ifp)
 {     
 //  IFQ_INIT(&ifp->if_snd);
   queue_init(&ifp->port_list.if_rcv_port_list);
@@ -429,11 +428,7 @@ device_write (void *d, mach_port_t reply
  * Other network operations
  */
 static io_return_t
-net_getstat(ifp, flavor, status, count)
-	struct ifnet	*ifp;
-	dev_flavor_t	flavor;
-	dev_status_t	status;		/* pointer to OUT array */
-	natural_t	*count;		/* OUT */
+net_getstat(struct ifnet *ifp, dev_flavor_t flavor, dev_status_t status /* pointer to OUT array */, natural_t *count /* OUT */)
 {
 #define ETHERMTU 1500
 	switch (flavor) {
@@ -627,7 +622,7 @@ device_set_filter (void *d, mach_port_t
 }
 
 /* Do any initialization required for network devices.  */
-static void linux_net_emulation_init ()
+static void linux_net_emulation_init (void)
 {
   skb_done_head_init();
   l4dde26_register_rx_callback(netif_rx_handle);
@@ -654,7 +649,7 @@ static struct machdev_device_emulation_o
   NULL
 };
 
-void machdevdde_register_net()
+void machdevdde_register_net(void)
 {
   machdev_register (&linux_net_emulation_ops);
 }
Index: hurd-debian/libdde-linux26/contrib/include/linux/autoconf.h
===================================================================
--- hurd-debian.orig/libdde-linux26/contrib/include/linux/autoconf.h
+++ hurd-debian/libdde-linux26/contrib/include/linux/autoconf.h
@@ -472,7 +472,6 @@
 #define CONFIG_64BIT 1
 #else
 #define CONFIG_X86_32 1
-#else
 #endif
 #define CONFIG_PCI_MMCONFIG 1
 #define CONFIG_SCHED_HRTICK 1
