# HG changeset patch # User diego # Date 1244036531 0 # Node ID 4f26b760cb37047d363f302f9e7e277511924013 # Parent ce8edb0e28974b73bc13d4e5c08fad21a843fb96 CONFIG_LIBNEMESI and CONFIG_LIVE555 are not defined to 0/1 values. Thus, we cannot check for them in an #if directive, but have to use #if defined() instead. diff -r ce8edb0e2897 -r 4f26b760cb37 cfg-common-opts.h --- a/cfg-common-opts.h Tue Jun 02 18:37:31 2009 +0000 +++ b/cfg-common-opts.h Wed Jun 03 13:42:11 2009 +0000 @@ -83,12 +83,12 @@ #ifdef CONFIG_LIVE555 {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif /* CONFIG_LIVE555 */ -#ifdef CONFIG_LIBNEMESI || CONFIG_LIVE555 +#if defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555) // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP {"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #else {"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" or \"libnemesi\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_LIVE555 || CONFIG_LIBNEMESI */ +#endif /* defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555) */ #ifdef CONFIG_LIBNEMESI {"rtsp-stream-over-sctp", &rtsp_transport_sctp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #else