From ff6a17f203ec4243f167ca2c82b94ecd6e775212 Mon Sep 17 00:00:00 2001 From: bertrand Date: Sat, 17 May 2003 12:24:01 +0000 Subject: Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10122 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cfg-common.h') diff --git a/cfg-common.h b/cfg-common.h index 9f3d03bbbd..238a26c195 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -36,7 +36,7 @@ {"csslib", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif -#ifdef STREAMING +#ifdef MPLAYER_NETWORK {"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, @@ -245,7 +245,7 @@ extern int flip; /* from dec_audio, currently used for ac3surround decoder only */ extern int audio_output_channels; -#ifdef STREAMING +#ifdef MPLAYER_NETWORK /* defined in network.c */ extern char *network_username; extern char *network_password; -- cgit v1.2.3