X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=0d745e50c5f3152c3984758c2260d0acf65a7fd1;hb=ff5dcaaeff14f4eb8d7cabe7a7af2cf66fa39512;hp=99670110edec6d4d47eaf6c4709c60d3be3e5f8c;hpb=87a709a4ea5dffaadaf35ef94edb4b578eb3b56c;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index 99670110e..0d745e50c 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -44,6 +44,8 @@ extern "C" {
 #define TIMING(...)
 #endif
 
+#undef check
+
 /** The maximum number of audio channels that we can cope with */
 #define MAX_AUDIO_CHANNELS 6
 
@@ -55,7 +57,7 @@ extern void stacktrace (std::ostream &, int);
 extern std::string dependency_version_summary ();
 extern double seconds (struct timeval);
 extern void dvdomatic_setup ();
-extern void dvdomatic_setup_i18n (std::string);
+extern void dvdomatic_setup_gettext_i18n (std::string);
 extern std::vector<std::string> split_at_spaces_considering_quotes (std::string);
 extern std::string md5_digest (std::string);
 extern std::string md5_digest (void const *, int);
@@ -150,6 +152,9 @@ struct Position
 	int y;
 };
 
+namespace dvdomatic
+{
+	
 /** @struct Rect
  *  @brief A rectangle.
  */
@@ -185,6 +190,8 @@ struct Rect
 	Rect intersection (Rect const & other) const;
 };
 
+}
+
 extern std::string crop_string (Position, libdcp::Size);
 extern int dcp_audio_sample_rate (int);
 extern std::string colour_lut_index_to_name (int index);
@@ -292,7 +299,6 @@ private:
 
 extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second);
 extern bool still_image_file (std::string);
-extern std::pair<std::string, int> cpu_info ();
 
 class LocaleGuard
 {