diff options
author | joe <joe@FreeBSD.org> | 2002-11-06 21:37:21 +0000 |
---|---|---|
committer | joe <joe@FreeBSD.org> | 2002-11-06 21:37:21 +0000 |
commit | 7a3b87e1c5d8ccd746e5d96f98290b5adde2ef6e (patch) | |
tree | 41ef72a54a4f7e98e5c9ecb9a76dda839740c460 | |
parent | 5203196b0a0d022c510861b161a6d2439ccf76bb (diff) | |
download | FreeBSD-src-7a3b87e1c5d8ccd746e5d96f98290b5adde2ef6e.zip FreeBSD-src-7a3b87e1c5d8ccd746e5d96f98290b5adde2ef6e.tar.gz |
Packed structures are defined differently in older gcc's, like the one
currently in -stable. Put the exception into usb.h instead of having it
hard coded in the sound code.
-rw-r--r-- | sys/dev/sound/usb/uaudioreg.h | 4 | ||||
-rw-r--r-- | sys/dev/usb/usb.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/sound/usb/uaudioreg.h b/sys/dev/sound/usb/uaudioreg.h index 4d6e834..20c87cb 100644 --- a/sys/dev/sound/usb/uaudioreg.h +++ b/sys/dev/sound/usb/uaudioreg.h @@ -55,10 +55,6 @@ #define UDESCSUB_AC_PROCESSING 7 #define UDESCSUB_AC_EXTENSION 8 -#if defined(__FreeBSD__) && (__FreeBSD_version <= 500014) -#define UPACKED __attribute__ ((packed)) -#endif - /* The first fields are identical to usb_endpoint_descriptor_t */ typedef struct { uByte bLength; diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h index d9f2085..e527859 100644 --- a/sys/dev/usb/usb.h +++ b/sys/dev/usb/usb.h @@ -98,7 +98,11 @@ typedef u_int8_t uDWord[4]; #define USETDW(w,v) (*(u_int32_t *)(w) = (v)) #endif +#if defined(__FreeBSD__) && (__FreeBSD_version <= 500014) +#define UPACKED __attribute__ ((packed)) +#else #define UPACKED __packed +#endif typedef struct { uByte bmRequestType; |