[pulseaudio-commits] Branch 'next' - src/utils

[Tanu Kaskinen]

 src/utils/padsp.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit ca63a2b36477fd1377804768d03e6de032c9cc8e
Author: Khem Raj <raj.khem at gmail.com>
Date:   Mon Apr 6 21:56:31 2015 -0700

    padsp: Make it compile on musl
    
    break assumptions on glibc and there is no stat64 on non
    glibc C libraries
    
    See pulseaudio bug
    
    https://bugs.freedesktop.org/show_bug.cgi?id=85319
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>

diff --git a/src/utils/padsp.c b/src/utils/padsp.c
index f74122a7..2e02f0bb 100644
--- a/src/utils/padsp.c
+++ b/src/utils/padsp.c
@@ -2384,7 +2384,7 @@ fail:
     return ret;
 }
 
-#ifdef sun
+#ifndef __GLIBC__
 int ioctl(int fd, int request, ...) {
 #else
 int ioctl(int fd, unsigned long request, ...) {
@@ -2524,10 +2524,13 @@ int stat(const char *pathname, struct stat *buf) {
 
     return 0;
 }
-
 #ifdef HAVE_OPEN64
-
+#undef stat64
+#ifdef __GLIBC__
 int stat64(const char *pathname, struct stat64 *buf) {
+#else
+int stat64(const char *pathname, struct stat *buf) {
+#endif
     struct stat oldbuf;
     int ret;
 
@@ -2560,7 +2563,7 @@ int stat64(const char *pathname, struct stat64 *buf) {
 
     return 0;
 }
-
+#undef open64
 int open64(const char *filename, int flags, ...) {
     va_list args;
     mode_t mode = 0;
@@ -2686,8 +2689,8 @@ FILE* fopen(const char *filename, const char *mode) {
 }
 
 #ifdef HAVE_OPEN64
-
-FILE *fopen64(const char *filename, const char *mode) {
+#undef fopen64
+FILE *fopen64(const char *__restrict filename, const char *__restrict mode) {
 
     debug(DEBUG_LEVEL_VERBOSE, __FILE__": fopen64(%s)\n", filename?filename:"NULL");