From 58502b38d3eaf5649c9e09b6af6ea84d726dccd1 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 17 Oct 2013 21:53:19 +0200
Subject: *: use std::numeric_limits

---
 src/tag/Aiff.cxx | 4 ++--
 src/tag/Riff.cxx | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/tag')

diff --git a/src/tag/Aiff.cxx b/src/tag/Aiff.cxx
index 4135565f7..73e46e49f 100644
--- a/src/tag/Aiff.cxx
+++ b/src/tag/Aiff.cxx
@@ -23,7 +23,7 @@
 #include "system/ByteOrder.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
+#include <limits>
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -81,7 +81,7 @@ aiff_seek_id3(FILE *file)
 			return 0;
 
 		size = FromBE32(chunk.size);
-		if (size > G_MAXINT32)
+		if (size > unsigned(std::numeric_limits<int>::max()))
 			/* too dangerous, bail out: possible integer
 			   underflow when casting to off_t */
 			return 0;
diff --git a/src/tag/Riff.cxx b/src/tag/Riff.cxx
index 3728d281c..ad64afc39 100644
--- a/src/tag/Riff.cxx
+++ b/src/tag/Riff.cxx
@@ -23,12 +23,11 @@
 #include "system/ByteOrder.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
+#include <limits>
 
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <string.h>
 
 static constexpr Domain riff_domain("riff");
@@ -79,7 +78,7 @@ riff_seek_id3(FILE *file)
 			return 0;
 
 		size = FromLE32(chunk.size);
-		if (size > G_MAXINT32)
+		if (size > size_t(std::numeric_limits<int>::max()))
 			/* too dangerous, bail out: possible integer
 			   underflow when casting to off_t */
 			return 0;
-- 
cgit v1.2.3