From 3ca61bba76615852b3d8a7ee2bcc0fd86acf845e Mon Sep 17 00:00:00 2001
From: Bernhard Walle <bernhard@bwalle.de>
Date: Sun, 17 Dec 2006 19:44:57 +0000
Subject: [PATCH] panel-plugin/net.{c,h}, panel-plugin/os.h:   - added code for
 DragonFly BSD, thanks to Bob Bagwill <bob@bagwill.com>     (fixed #1456)

(Old svn revision: 2247)
---
 panel-plugin/net.c |   2 +-
 panel-plugin/net.h |   2 +-
 panel-plugin/os.h  | 364 ++++++++++++++++++++++++---------------------
 3 files changed, 196 insertions(+), 172 deletions(-)

diff --git a/panel-plugin/net.c b/panel-plugin/net.c
index e31b423..703c693 100644
--- a/panel-plugin/net.c
+++ b/panel-plugin/net.c
@@ -46,7 +46,7 @@
 #elif __APPLE__
 # include "src/macos.h"
 # include "src/macos.c"
-#elif __FreeBSD__
+#elif __FreeBSD__ || __DragonFly__
 # include "wormulon/freebsd.h"
 # include "wormulon/freebsd.c"
 #elif __linux__
diff --git a/panel-plugin/net.h b/panel-plugin/net.h
index bed7a80..7901be4 100644
--- a/panel-plugin/net.h
+++ b/panel-plugin/net.h
@@ -62,7 +62,7 @@ typedef struct
 #ifdef __HPUX__
     int             wait_pcks_counter;
     nmapi_logstat*  if_ptr;
-#elif __FreeBSD__
+#elif __FreeBSD__ || __DragonFly__
     int             watchif;
     int             dev_opened;
 #elif __NetBSD__
diff --git a/panel-plugin/os.h b/panel-plugin/os.h
index 67b6b05..0d00922 100644
--- a/panel-plugin/os.h
+++ b/panel-plugin/os.h
@@ -19,186 +19,210 @@
 #define _OS_H
 
 #if defined (__sun__)
-#define __Solaris__ 1
+#  define __Solaris__ 1
 #endif
 
 #ifdef __HPUX__             /* H P U X */
-#define _XOPEN_SOURCE_EXTENDED
-#include <stdio.h>
-#include <sys/param.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stropts.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <signal.h>
-#include <sys/stdsyms.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <sys/mib.h>
-#include <arpa/inet.h>
-#include <net/if.h>
+#  define _XOPEN_SOURCE_EXTENDED
+#  include <stdio.h>
+#  include <sys/param.h>
+#  include <stdlib.h>
+#  include <stdarg.h>
+#  include <stropts.h>
+#  include <unistd.h>
+#  include <string.h>
+#  include <time.h>
+#  include <ctype.h>
+#  include <signal.h>
+#  include <sys/stdsyms.h>
+#  include <sys/wait.h>
+#  include <sys/stat.h>
+#  include <sys/ioctl.h>
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <sys/time.h>
+#  include <netinet/in.h>
+#  include <net/if.h>
+#  include <sys/mib.h>
+#  include <arpa/inet.h>
+#  include <net/if.h>
 #elif __APPLE__             /* Mac OS X */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <signal.h>
-#include <curses.h>
-#include <ifaddrs.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <net/route.h>
-#include <net/if_dl.h>
-#include <net/if.h>
-#include <net/if_media.h>
-#include <net/if_mib.h>
-#include <arpa/inet.h>
+#  include <stdio.h>
+#  include <stdlib.h>
+#  include <stdarg.h>
+#  include <unistd.h>
+#  include <string.h>
+#  include <time.h>
+#  include <ctype.h>
+#  include <signal.h>
+#  include <curses.h>
+#  include <ifaddrs.h>
+#  include <sys/param.h>
+#  include <sys/sysctl.h>
+#  include <sys/wait.h>
+#  include <sys/stat.h>
+#  include <sys/ioctl.h>
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <sys/time.h>
+#  include <netinet/in.h>
+#  include <net/route.h>
+#  include <net/if_dl.h>
+#  include <net/if.h>
+#  include <net/if_media.h>
+#  include <net/if_mib.h>
+#  include <arpa/inet.h>
+#elif __DragonFly__           /* D R A G O N F L Y */
+#  include <stdio.h>
+#  include <stdlib.h>
+#  include <stdarg.h>
+#  include <unistd.h>
+#  include <string.h>
+#  include <time.h>
+#  include <ctype.h>
+#  include <signal.h>
+#  include <sys/param.h>
+#  include <sys/sysctl.h>
+#  include <sys/wait.h>
+#  include <sys/stat.h>
+#  include <sys/ioctl.h>
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <sys/time.h>
+#  include <netinet/in.h>
+#  include <net/if.h>
+#  include <net/if_media.h>
+#  include <net/if_mib.h>
+#  include <arpa/inet.h>
+#  include <net/ppp_layer/ppp_defs.h>
+#  include <net/ppp/if_ppp.h>
 #elif __FreeBSD__           /* F R E E B S D */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <signal.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <net/if_media.h>
-#include <net/if_mib.h>
-#include <arpa/inet.h>
-#include <net/ppp_defs.h>
-#include <net/if_ppp.h>
+#  include <stdio.h>
+#  include <stdlib.h>
+#  include <stdarg.h>
+#  include <unistd.h>
+#  include <string.h>
+#  include <time.h>
+#  include <ctype.h>
+#  include <signal.h>
+#  include <sys/param.h>
+#  include <sys/sysctl.h>
+#  include <sys/wait.h>
+#  include <sys/stat.h>
+#  include <sys/ioctl.h>
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <sys/time.h>
+#  include <netinet/in.h>
+#  include <net/if.h>
+#  include <net/if_media.h>
+#  include <net/if_mib.h>
+#  include <arpa/inet.h>
+#  include <net/ppp_defs.h>
+#  include <net/if_ppp.h>
 #elif __NetBSD__            /* N E T B S D */
-#include <stdio.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <net/if_media.h>
-#include <net/route.h>
-#include <net/if_dl.h>
-#include <arpa/inet.h>
-#include <net/ppp_defs.h>
-#include <net/if_ppp.h>
-#include <net/if.h>
+#  include <stdio.h>
+#  include <sys/param.h>
+#  include <sys/sysctl.h>
+#  include <stdlib.h>
+#  include <stdarg.h>
+#  include <unistd.h>
+#  include <string.h>
+#  include <time.h>
+#  include <ctype.h>
+#  include <signal.h>
+#  include <sys/wait.h>
+#  include <sys/stat.h>
+#  include <sys/ioctl.h>
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <sys/time.h>
+#  include <netinet/in.h>
+#  include <net/if.h>
+#  include <net/if_media.h>
+#  include <net/route.h>
+#  include <net/if_dl.h>
+#  include <arpa/inet.h>
+#  include <net/ppp_defs.h>
+#  include <net/if_ppp.h>
+#  include <net/if.h>
 #elif __OpenBSD__ || __MicroBSD__           /* O P E N B S D */
-#include <stdio.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <net/if_media.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <arpa/inet.h>
-#include <net/ppp_defs.h>
-#include <net/if_ppp.h>
+#  include <stdio.h>
+#  include <sys/param.h>
+#  include <sys/sysctl.h>
+#  include <stdlib.h>
+#  include <stdarg.h>
+#  include <unistd.h>
+#  include <string.h>
+#  include <time.h>
+#  include <ctype.h>
+#  include <signal.h>
+#  include <sys/wait.h>
+#  include <sys/stat.h>
+#  include <sys/ioctl.h>
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <sys/time.h>
+#  include <netinet/in.h>
+#  include <net/if.h>
+#  include <net/if_media.h>
+#  include <net/if_dl.h>
+#  include <net/route.h>
+#  include <arpa/inet.h>
+#  include <net/ppp_defs.h>
+#  include <net/if_ppp.h>
 #elif __linux__             /* L I N U X */
-#include <stdio.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <arpa/inet.h>
-#include <net/ppp_defs.h>
-#include <net/if_ppp.h>
+#  include <stdio.h>
+#  include <sys/param.h>
+#  include <sys/sysctl.h>
+#  include <stdlib.h>
+#  include <stdarg.h>
+#  include <unistd.h>
+#  include <string.h>
+#  include <time.h>
+#  include <ctype.h>
+#  include <signal.h>
+#  include <sys/wait.h>
+#  include <sys/stat.h>
+#  include <sys/ioctl.h>
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <sys/time.h>
+#  include <netinet/in.h>
+#  include <net/if.h>
+#  include <arpa/inet.h>
+#  include <net/ppp_defs.h>
+#  include <net/if_ppp.h>
 #elif __Solaris__           /* S O L A R I S */
-#include <stdio.h>
-#define _WIDEC_H
-#include <sys/param.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <stropts.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <net/if.h>
-#include <kstat.h>
-#include <net/if.h>
-#include <sys/sockio.h>
-#include <arpa/inet.h>
-#include <net/if.h>
+#  include <stdio.h>
+#  define _WIDEC_H
+#  include <sys/param.h>
+#  include <stdlib.h>
+#  include <stdarg.h>
+#  include <unistd.h>
+#  include <string.h>
+#  include <time.h>
+#  include <ctype.h>
+#  include <signal.h>
+#  include <sys/wait.h>
+#  include <sys/stat.h>
+#  include <sys/ioctl.h>
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <sys/time.h>
+#  include <netinet/in.h>
+#  include <net/if.h>
+#  include <stropts.h>
+#  include <sys/socket.h>
+#  include <sys/sockio.h>
+#  include <net/if.h>
+#  include <kstat.h>
+#  include <net/if.h>
+#  include <sys/sockio.h>
+#  include <arpa/inet.h>
+#  include <net/if.h>
 #else
-#error "OS not supported"
+#  error "OS not supported"
 #endif
 
 #endif