freebsd-ports/games/xkoules/files/patch-ab
Maxim Sobolev 7ca8dfe98a - Fix new compiler error
- Exclude GPL doc from package

PR:		19222
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
2000-06-22 10:05:54 +00:00

47 lines
1.3 KiB
Text

--- xlib/shmbitmap.c.orig Thu Mar 5 03:59:19 1998
+++ xlib/shmbitmap.c Tue Jun 13 03:45:28 2000
@@ -237,7 +237,7 @@
#define __clipy1 0
#undef __clipy2
#define __clipy2 (MAPHEIGHT+19)
-#ifdef __i386__
+#if defined(__i386__)&&defined(ASSEMBLY)
static INLINE int
muldiv64 (int CONST m1, int CONST m2, int CONST d)
{
@@ -333,7 +333,7 @@
}
if (r1 & 1)
{ /* left */
-#ifdef __i386__
+#if defined(__i386__)&&defined(ASSEMBLY)
y1 += muldiv64 (__clipx1 - x1, y2 - y1, x2 - x1);
#else
y1 += (long) (__clipx1 - x1) * (long) (y2 - y1) / (long) (x2 - x1);
@@ -342,7 +342,7 @@
}
else if (r1 & 2)
{ /* right */
-#ifdef __i386__
+#if defined(__i386__)&&defined(ASSEMBLY)
y1 += muldiv64 (__clipx2 - x1, y2 - y1, x2 - x1);
#else
y1 += (long) (__clipx2 - x1) * (long) (y2 - y1) / (long) (x2 - x1);
@@ -351,7 +351,7 @@
}
else if (r1 & 4)
{ /* top */
-#ifdef __i386__
+#if defined(__i386__)&&defined(ASSEMBLY)
x1 += muldiv64 (__clipy1 - y1, x2 - x1, y2 - y1);
#else
x1 += (long) (__clipy1 - y1) * (long) (x2 - x1) / (long) (y2 - y1);
@@ -360,7 +360,7 @@
}
else if (r1 & 8)
{ /* bottom */
-#ifdef __i386__
+#if defined(__i386__)&&defined(ASSEMBLY)
x1 += muldiv64 (__clipy2 - y1, x2 - x1, y2 - y1);
#else
x1 += (long) (__clipy2 - y1) * (long) (x2 - x1) / (long) (y2 - y1);