[pulseaudio-commits] src/modules

[Colin Guthrie]

 src/modules/bluetooth/ipc.c                |   18 +++++++++---------
 src/modules/bluetooth/ipc.h                |    2 +-
 src/modules/bluetooth/sbc/sbc_primitives.h |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 3927b4b60716314a3db53587f90ce0e3c13c0197
Author: Colin Guthrie <colin at mageia.org>
Date:   Fri Feb 24 21:22:38 2012 +0000

    bluetooth: Run update-sbc
    
    This is primarily for the bluez commit 03bb9d3 by Siamashka Siamashka
    which fixes a compilation error with gcc 4.7

diff --git a/src/modules/bluetooth/ipc.c b/src/modules/bluetooth/ipc.c
index 669eeef..02d956b 100644
--- a/src/modules/bluetooth/ipc.c
+++ b/src/modules/bluetooth/ipc.c
@@ -56,19 +56,19 @@ int bt_audio_service_open(void)
 
 	sk = socket(PF_LOCAL, SOCK_STREAM, 0);
 	if (sk < 0) {
-		err = errno;
+		err = -errno;
 		fprintf(stderr, "%s: Cannot open socket: %s (%d)\n",
-			__FUNCTION__, strerror(err), err);
-		errno = err;
+			__FUNCTION__, strerror(-err), -err);
+		errno = -err;
 		return -1;
 	}
 
 	if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-		err = errno;
+		err = -errno;
 		fprintf(stderr, "%s: connect() failed: %s (%d)\n",
-			__FUNCTION__, strerror(err), err);
+			__FUNCTION__, strerror(-err), -err);
 		close(sk);
-		errno = err;
+		errno = -err;
 		return -1;
 	}
 
@@ -96,10 +96,10 @@ int bt_audio_service_get_data_fd(int sk)
 
 	ret = recvmsg(sk, &msgh, 0);
 	if (ret < 0) {
-		err = errno;
+		err = -errno;
 		fprintf(stderr, "%s: Unable to receive fd: %s (%d)\n",
-			__FUNCTION__, strerror(err), err);
-		errno = err;
+			__FUNCTION__, strerror(-err), -err);
+		errno = -err;
 		return -1;
 	}
 
diff --git a/src/modules/bluetooth/ipc.h b/src/modules/bluetooth/ipc.h
index 77c57d3..61ae019 100644
--- a/src/modules/bluetooth/ipc.h
+++ b/src/modules/bluetooth/ipc.h
@@ -265,7 +265,7 @@ struct bt_start_stream_rsp {
 } __attribute__ ((packed));
 
 /* This message is followed by one byte of data containing the stream data fd
-   as ancilliary data */
+   as ancillary data */
 struct bt_new_stream_ind {
 	bt_audio_msg_header_t	h;
 } __attribute__ ((packed));
diff --git a/src/modules/bluetooth/sbc/sbc_primitives.h b/src/modules/bluetooth/sbc/sbc_primitives.h
index 3fec8d5..17ad4f7 100644
--- a/src/modules/bluetooth/sbc/sbc_primitives.h
+++ b/src/modules/bluetooth/sbc/sbc_primitives.h
@@ -31,7 +31,7 @@
 #define SBC_X_BUFFER_SIZE 328
 
 #ifdef __GNUC__
-#define SBC_ALWAYS_INLINE __attribute__((always_inline))
+#define SBC_ALWAYS_INLINE inline __attribute__((always_inline))
 #else
 #define SBC_ALWAYS_INLINE inline
 #endif