[Glibc-bsd-commits] r3477 - in trunk/freebsd-libs/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-06-24 20:17:13 +0000 (Fri, 24 Jun 2011)
New Revision: 3477

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/12_usb.diff
Log:
  * Replace use of __aligned() in libusb.h and libusb20_desc.h.
    (Closes: #631544)

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2011-06-24 13:55:45 UTC (rev 3476)
+++ trunk/freebsd-libs/debian/changelog	2011-06-24 20:17:13 UTC (rev 3477)
@@ -1,3 +1,10 @@
+freebsd-libs (8.2+ds1-2) UNRELEASED; urgency=low
+
+  * Replace use of __aligned() in libusb.h and libusb20_desc.h.
+    (Closes: #631544)
+
+ -- Robert Millan <rmh at debian.org>  Fri, 24 Jun 2011 22:15:36 +0200
+
 freebsd-libs (8.2+ds1-1) unstable; urgency=low
 
   * Bump libgeom SOVERSION from 0 to 1 and rename package libgeom0 to

Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff	2011-06-24 13:55:45 UTC (rev 3476)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff	2011-06-24 20:17:13 UTC (rev 3477)
@@ -30,3 +30,102 @@
  	pbe = libusb20_be_alloc(&libusb20_ugen20_backend);
  #else
  	pbe = NULL;
+--- a/lib/libusb/libusb.h
++++ b/lib/libusb/libusb.h
+@@ -220,7 +220,7 @@
+ 	uint8_t	bSynchAddress;
+ 	uint8_t *extra;
+ 	int	extra_length;
+-}	libusb_endpoint_descriptor __aligned(sizeof(void *));
++}	libusb_endpoint_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_interface_descriptor {
+ 	uint8_t	bLength;
+@@ -235,12 +235,12 @@
+ 	struct libusb_endpoint_descriptor *endpoint;
+ 	uint8_t *extra;
+ 	int	extra_length;
+-}	libusb_interface_descriptor __aligned(sizeof(void *));
++}	libusb_interface_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_interface {
+ 	struct libusb_interface_descriptor *altsetting;
+ 	int	num_altsetting;
+-}	libusb_interface __aligned(sizeof(void *));
++}	libusb_interface __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_config_descriptor {
+ 	uint8_t	bLength;
+@@ -254,7 +254,7 @@
+ 	struct libusb_interface *interface;
+ 	uint8_t *extra;
+ 	int	extra_length;
+-}	libusb_config_descriptor __aligned(sizeof(void *));
++}	libusb_config_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_control_setup {
+ 	uint8_t	bmRequestType;
+@@ -270,7 +270,7 @@
+ 	uint32_t length;
+ 	uint32_t actual_length;
+ 	enum libusb_transfer_status status;
+-}	libusb_iso_packet_descriptor __aligned(sizeof(void *));
++}	libusb_iso_packet_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
+ 
+@@ -289,7 +289,7 @@
+ 	void *os_priv;
+ 	int	num_iso_packets;
+ 	struct libusb_iso_packet_descriptor iso_packet_desc[0];
+-}	libusb_transfer __aligned(sizeof(void *));
++}	libusb_transfer __attribute__((__aligned__(sizeof(void *))));
+ 
+ /* Library initialisation */
+ 
+--- a/lib/libusb/libusb20_desc.h
++++ b/lib/libusb/libusb20_desc.h
+@@ -98,7 +98,7 @@
+ 	void   *ptr;			/* data pointer */
+ 	uint16_t len;			/* defaults to zero */
+ 	uint16_t type;			/* defaults to LIBUSB20_ME_IS_EMPTY */
+-} __aligned(LIBUSB20_ME_STRUCT_ALIGN);
++} __attribute__((__aligned__(LIBUSB20_ME_STRUCT_ALIGN)));
+ 
+ struct libusb20_me_format {
+ 	const uint8_t *format;		/* always set */
+@@ -120,7 +120,7 @@
+ 	   LIBUSB20_ME_IS_##un##SIGNED ,				\
+ 	   (size) & 0xFF, ((size) / 0x100) & 0xFF, )		\
+   LIBUSB20_NOT(ismeta) ( u##int##bits##_t				\
+-		    __aligned((bits) / 8) field a; )
++		    __attribute__((__aligned__((bits) / 8))) field a; )
+ 
+ #define	LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
+   LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
+@@ -498,7 +498,7 @@
+ struct libusb20_endpoint {
+ 	struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
+ 	struct libusb20_me_struct extra;
+-} __aligned(sizeof(void *));
++} __attribute__((__aligned__(sizeof(void *))));
+ 
+ struct libusb20_interface {
+ 	struct LIBUSB20_INTERFACE_DESC_DECODED desc;
+@@ -507,14 +507,14 @@
+ 	struct libusb20_endpoint *endpoints;
+ 	uint8_t	num_altsetting;
+ 	uint8_t	num_endpoints;
+-} __aligned(sizeof(void *));
++} __attribute__((__aligned__(sizeof(void *))));
+ 
+ struct libusb20_config {
+ 	struct LIBUSB20_CONFIG_DESC_DECODED desc;
+ 	struct libusb20_me_struct extra;
+ 	struct libusb20_interface *interface;
+ 	uint8_t	num_interface;
+-} __aligned(sizeof(void *));
++} __attribute__((__aligned__(sizeof(void *))));
+ 
+ uint8_t	libusb20_me_get_1(const struct libusb20_me_struct *ie, uint16_t offset);
+ uint16_t libusb20_me_get_2(const struct libusb20_me_struct *ie, uint16_t offset);