From 949d257fa1cd9928b9717e06b299af8e1b03fd7e Mon Sep 17 00:00:00 2001
From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Mon, 5 Apr 2010 22:17:02 +0200
Subject: win32: od_bloaty: rename some symbols due to conflict on Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 coreutils/od_bloaty.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 6a532fa9d..7b1ab8981 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -84,6 +84,13 @@ typedef long long llong;
 # define LDBL_DIG DBL_DIG
 #endif
 
+#ifdef __MINGW32__
+/* symbol conflict */
+#define CHAR SIZE_CHAR
+#define SHORT SIZE_SHORT
+#define LONG SIZE_LONG
+#define INT SIZE_INT
+#endif
 enum size_spec {
 	NO_SIZE,
 	CHAR,
-- 
cgit v1.2.3-55-g6feb