mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Run update-sbc

Browse source 
This is primarily for the bluez commit 03bb9d3 by Siamashka Siamashka
which fixes a compilation error with gcc 4.7
This commit is contained in:
Colin Guthrie 2012-02-24 21:22:38 +00:00
parent 0b421f0d93
commit 3927b4b607
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/bluetooth/ipc.c
View file

@ -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;
}

2
src/modules/bluetooth/ipc.h
View file

@ -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));

2
src/modules/bluetooth/sbc/sbc_primitives.h
View file

@ -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