From 1d3e7ea3dd371b6b01ddf679437dbe0e30bbf847 Mon Sep 17 00:00:00 2001
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 6 Jul 2000 13:23:35 +0000
Subject: [PATCH] Properly fix world.

Sorry for breaking things in the first place.
---
 sys/dev/usb/usb_port.h | 2 --
 sys/dev/usb/usbhid.h   | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index caf64faddd6..61ac3825439 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -296,8 +296,6 @@ __CONCAT(dname,_detach)(self, flags) \
 #define clalloc(p, s, x) (clist_alloc_cblocks((p), (s), (s)), 0)
 #define clfree(p) clist_free_cblocks((p))
 
-#define UPACKED __attribute__ ((packed))
-
 #define PWR_RESUME 0
 #define PWR_SUSPEND 1
 
diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index a662f851c3e..d404a3870b1 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/dev/usb/usbhid.h
@@ -54,7 +54,9 @@
 #define UR_GET_PROTOCOL		0x03
 #define UR_SET_PROTOCOL		0x0b
 
+#if defined(__FreeBSD__)
 #define UPACKED __attribute__ ((packed))
+#endif
 
 typedef struct usb_hid_descriptor {
 	uByte		bLength;