[Goodies-commits] r2270 - in xfce4-wavelan-plugin/trunk: . panel-plugin

[James Westby]

Author: jamesw
Date: 2006-12-21 21:36:06 +0000 (Thu, 21 Dec 2006)
New Revision: 2270

Modified:
   xfce4-wavelan-plugin/trunk/ChangeLog
   xfce4-wavelan-plugin/trunk/panel-plugin/wi_bsd.c
Log:

	* Add patch from Petr Salinger <Petr.Salinger at seznam.cz> to fix
	  compilation on kfreebsd.



Modified: xfce4-wavelan-plugin/trunk/ChangeLog
===================================================================
--- xfce4-wavelan-plugin/trunk/ChangeLog	2006-12-20 23:49:14 UTC (rev 2269)
+++ xfce4-wavelan-plugin/trunk/ChangeLog	2006-12-21 21:36:06 UTC (rev 2270)
@@ -1,3 +1,8 @@
+2006-12-21 21:34  james
+
+	* Add patch from Petr Salinger <Petr.Salinger at seznam.cz> to fix
+	  compilation on kfreebsd.
+
 2006-09-11 08:11  nick
 
 	* Fix typo in panel-plugin/Makefile.am

Modified: xfce4-wavelan-plugin/trunk/panel-plugin/wi_bsd.c
===================================================================
--- xfce4-wavelan-plugin/trunk/panel-plugin/wi_bsd.c	2006-12-20 23:49:14 UTC (rev 2269)
+++ xfce4-wavelan-plugin/trunk/panel-plugin/wi_bsd.c	2006-12-21 21:36:06 UTC (rev 2270)
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) 
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
@@ -35,7 +35,7 @@
 
 #include <net/if.h>
 #include <net/if_media.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <net/if_var.h>
 #include <net/ethernet.h>
 
@@ -62,6 +62,22 @@
 #endif
 #endif
 
+#if defined(__GLIBC__)
+
+#define  strlcpy(dst, src, size) g_strlcpy(dst, src, size)
+
+#include <byteswap.h>
+#include <endian.h>
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define le16toh(x)      ((uint16_t)(x))
+#elif __BYTE_ORDER == __BIG_ENDIAN
+#define le16toh(x)      bswap16((x))
+#else
+#error unknown ENDIAN
+#endif
+
+#endif /* __GLIBC__ */
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>