Revert "live555: Don't put any INT64_C related hack here. We need to fix that properly."

[vlc] / modules / demux / live555.cpp

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 0bde6e41787a9bc4557d48228a4a87915c7109d1..575de2744d298a2a8e44e7dbf87f8a5915934ae4 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -45,6 +45,7 @@
 #include <iostream>
 #include <limits.h>
 
+
 #if defined( WIN32 )
 #   include <winsock2.h>
 #endif
@@ -58,6 +59,14 @@ extern "C" {
 #include "../access/mms/asf.h"  /* Who said ugly ? */
 }
 
+/* XXX Ugly workaround: Buggy Mac OS X headers fail to define them */
+#ifndef INT64_C
+# define INT64_C(v)   (v ## LL)
+#endif
+#ifndef UINT64_C
+# define UINT64_C(v)   (v ## ULL)
+#endif
+
 using namespace std;
 
 /*****************************************************************************
@@ -84,7 +93,7 @@ static void Close( vlc_object_t * );
     "used for the connection.")
 
 vlc_module_begin();
-    set_description( _("RTP/RTSP/SDP demuxer (using Live555)" ) );
+    set_description( N_("RTP/RTSP/SDP demuxer (using Live555)" ) );
     set_capability( "demux", 50 );
     set_shortname( "RTP/RTSP");
     set_callbacks( Open, Close );
@@ -94,7 +103,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_INPUT_DEMUX );
 
     add_submodule();
-        set_description( _("RTSP/RTP access and demux") );
+        set_description( N_("RTSP/RTP access and demux") );
         add_shortcut( "rtsp" );
         add_shortcut( "sdp" );
         set_capability( "access_demux", 0 );