diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-05 00:11:21 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-05 00:11:21 +0100 |
| commit | e4b75132a31fef25960ea7abbf5dace418b1fc37 (patch) | |
| tree | f219c6fcf2ec0d8f1c58102872edf9d347dfa4a6 /src/xine-utils/utils.c | |
| parent | 6a2b53c22febcbc2041d760dccd795f388bc10c4 (diff) | |
| parent | 24cb81b12aa9ab7c351f917fa2027ee251a5be7f (diff) | |
| download | xine-lib-e4b75132a31fef25960ea7abbf5dace418b1fc37.tar.gz xine-lib-e4b75132a31fef25960ea7abbf5dace418b1fc37.tar.bz2 | |
Merge commits which I've already merged from 1.1...
Diffstat (limited to 'src/xine-utils/utils.c')
| -rw-r--r-- | src/xine-utils/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c index ac89aec14..bc5f1a228 100644 --- a/src/xine-utils/utils.c +++ b/src/xine-utils/utils.c @@ -38,10 +38,10 @@ #include <pwd.h> #include <sys/types.h> #include <sys/time.h> -#include <sys/socket.h> #include <time.h> #include <unistd.h> #include <fcntl.h> +#include <sys/socket.h> #if HAVE_EXECINFO_H #include <execinfo.h> |