From: Stefan Weil <weil@mail.berlios.de>
Date: Thu, 30 Sep 2010 20:05:42 +0000 (+0200)
Subject: rc4030: Fix compilation error in debug code
X-Git-Tag: v0.14.0-rc0~602
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b832134d8ab6cb455bf182c99e5610803d8d2500;p=thirdparty%2Fqemu.git

rc4030: Fix compilation error in debug code

min was unknown here, so avoid it.

Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/hw/rc4030.c b/hw/rc4030.c
index 223137323bb..abbc3eb4e27 100644
--- a/hw/rc4030.c
+++ b/hw/rc4030.c
@@ -749,7 +749,10 @@ static void rc4030_do_dma(void *opaque, int n, uint8_t *buf, int len, int is_wri
         printf("rc4030 dma: Copying %d bytes %s host %p\n",
             len, is_write ? "from" : "to", buf);
         for (i = 0; i < len; i += 16) {
-            int n = min(16, len - i);
+            int n = 16;
+            if (n > len - i) {
+                n = len - i;
+            }
             for (j = 0; j < n; j++)
                 printf("%02x ", buf[i + j]);
             while (j++ < 16)