summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2011-10-05 00:11:21 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2011-10-05 00:11:21 +0100
commite4b75132a31fef25960ea7abbf5dace418b1fc37 (patch)
treef219c6fcf2ec0d8f1c58102872edf9d347dfa4a6 /src/xine-engine
parent6a2b53c22febcbc2041d760dccd795f388bc10c4 (diff)
parent24cb81b12aa9ab7c351f917fa2027ee251a5be7f (diff)
downloadxine-lib-e4b75132a31fef25960ea7abbf5dace418b1fc37.tar.gz
xine-lib-e4b75132a31fef25960ea7abbf5dace418b1fc37.tar.bz2
Merge commits which I've already merged from 1.1...
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/xine_private.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xine-engine/xine_private.h b/src/xine-engine/xine_private.h
index a4c2a1d4f..a82f6a05f 100644
--- a/src/xine-engine/xine_private.h
+++ b/src/xine-engine/xine_private.h
@@ -95,10 +95,10 @@ void _x_audio_decoder_shutdown (xine_stream_t *stream) INTERNAL;
void xine_probe_fast_memcpy(xine_t *xine) INTERNAL;
/**
- * @brief make file descriptors and sockets uninheritable
+ * @brief Make file descriptors and sockets uninheritable
*/
-int _x_set_file_close_on_exec(int fd) XINE_INTERNAL;
+int _x_set_file_close_on_exec(int fd) INTERNAL;
-int _x_set_socket_close_on_exec(int s) XINE_INTERNAL;
+int _x_set_socket_close_on_exec(int s) INTERNAL;
#endif