diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-21 08:34:35 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-21 08:34:35 +0100 |
| commit | fd88ee34fa5f069412ec9572407babafb74d6554 (patch) | |
| tree | 764dffa7a25d192f368fb48eb5606d85d35a0e79 /package/mt-daapd/patches/patch-src_mp3-scanner_c | |
| parent | e7fbbc95bc3a73e938d7c0159978a73ee7c3d22a (diff) | |
| parent | 1a3b09a9daae7dc8e116900f2a45a5d6f0bd12f0 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/mt-daapd/patches/patch-src_mp3-scanner_c')
| -rw-r--r-- | package/mt-daapd/patches/patch-src_mp3-scanner_c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/package/mt-daapd/patches/patch-src_mp3-scanner_c b/package/mt-daapd/patches/patch-src_mp3-scanner_c new file mode 100644 index 000000000..e5defb78f --- /dev/null +++ b/package/mt-daapd/patches/patch-src_mp3-scanner_c @@ -0,0 +1,10 @@ +--- mt-daapd-0.2.4.2.orig/src/mp3-scanner.c 2008-04-19 21:17:23.000000000 +0200 ++++ mt-daapd-0.2.4.2/src/mp3-scanner.c 2014-01-20 12:19:42.000000000 +0100 +@@ -40,6 +40,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/param.h> + + #include <netinet/in.h> /* htons and friends */ + #include <sys/stat.h> |