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

[Petr Salinger]

Author: ps-guest
Date: 2013-07-23 16:20:33 +0000 (Tue, 23 Jul 2013)
New Revision: 4796

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/cdefs_macros.diff
Log:
 extend cdefs_macros.diff in libusb.h part



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2013-07-23 06:08:21 UTC (rev 4795)
+++ trunk/freebsd-libs/debian/changelog	2013-07-23 16:20:33 UTC (rev 4796)
@@ -1,3 +1,10 @@
+freebsd-libs (9.1+ds1-3) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * extend cdefs_macros.diff in libusb.h part
+
+ -- Robert Millan <rmh at debian.org>  Tue, 16 Jul 2013 15:24:27 +0200
+
 freebsd-libs (9.1+ds1-2) unstable; urgency=low
 
   * Bump freebsd-glue B-D (for roundup2).

Modified: trunk/freebsd-libs/debian/patches/cdefs_macros.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cdefs_macros.diff	2013-07-23 06:08:21 UTC (rev 4795)
+++ trunk/freebsd-libs/debian/patches/cdefs_macros.diff	2013-07-23 16:20:33 UTC (rev 4796)
@@ -53,6 +53,15 @@
  
  typedef struct libusb_ss_endpoint_companion_descriptor {
  	uint8_t bLength;
+@@ -250,7 +250,7 @@
+ 	uint8_t bMaxBurst;
+ 	uint8_t bmAttributes;
+ 	uint16_t wBytesPerInterval;
+-}	libusb_ss_endpoint_companion_descriptor __aligned(sizeof(void *));
++}	libusb_ss_endpoint_companion_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_interface_descriptor {
+ 	uint8_t	bLength;
 @@ -265,12 +265,12 @@
  	struct libusb_endpoint_descriptor *endpoint;
  	uint8_t *extra;
@@ -77,6 +86,33 @@
  
  typedef struct libusb_usb_2_0_device_capability_descriptor {
  	uint8_t bLength;
+@@ -292,7 +292,7 @@
+ 	uint8_t bDevCapabilityType;
+ 	uint32_t bmAttributes;
+ #define LIBUSB_USB_2_0_CAPABILITY_LPM_SUPPORT  (1 << 1)
+-}	libusb_usb_2_0_device_capability_descriptor __aligned(sizeof(void *));
++}	libusb_usb_2_0_device_capability_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_ss_usb_device_capability_descriptor {
+ 	uint8_t bLength;
+@@ -308,7 +308,7 @@
+ 	uint8_t bFunctionalitySupport;
+ 	uint8_t bU1DevExitLat;
+ 	uint16_t wU2DevExitLat;
+-}	libusb_ss_usb_device_capability_descriptor __aligned(sizeof(void *));
++}	libusb_ss_usb_device_capability_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_bos_descriptor {
+ 	uint8_t bLength;
+@@ -317,7 +317,7 @@
+ 	uint8_t bNumDeviceCapabilities;
+ 	struct libusb_usb_2_0_device_capability_descriptor *usb_2_0_ext_cap;
+ 	struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap;
+-}	libusb_bos_descriptor __aligned(sizeof(void *));
++}	libusb_bos_descriptor __attribute__((__aligned__(sizeof(void *))));
+ 
+ typedef struct libusb_control_setup {
+ 	uint8_t	bmRequestType;
 @@ -333,7 +333,7 @@
  	uint32_t length;
  	uint32_t actual_length;