SDL_stretch.c: backported fix for bug #3808

libsdl-org · Mar 24, 2018 · 6d2ff22 · 6d2ff22
1 parent 7aba846
commit 6d2ff22
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/video/SDL_stretch.c b/src/video/SDL_stretch.c
@@ -34,8 +34,8 @@
    into the general blitting mechanism.
 */
 
-#if ((defined(_MFC_VER) && defined(_M_IX86)/* && !defined(_WIN32_WCE) still needed? */) || \
-     defined(__WATCOMC__) || \
+#if ((defined(_MSC_VER) && defined(_M_IX86)) || \
+     (defined(__WATCOMC__) && defined(__386__)) || \
      (defined(__GNUC__) && defined(__i386__))) && SDL_ASSEMBLY_ROUTINES
 /* There's a bug with gcc 4.4.1 and -O2 where srcp doesn't get the correct
  * value after the first scanline.  FIXME? */
@@ -54,7 +54,7 @@
 #define PAGE_ALIGNED
 #endif
 
-#if defined(_M_IX86) || defined(i386)
+#if defined(_M_IX86) || defined(__i386__) || defined(__386__)
 #define PREFIX16	0x66
 #define STORE_BYTE	0xAA
 #define STORE_WORD	0xAB
@@ -116,7 +116,7 @@ static int generate_rowbytes(int src_w, int dst_w, int bpp)
 	inc = (src_w << 16) / dst_w;
 	eip = copy_row;
 	fence = copy_row+sizeof(copy_row)-2;
-	for ( i=0; i<dst_w && eip < end; ++i ) {
+	for ( i=0; i<dst_w; ++i ) {
 		while ( pos >= 0x10000L ) {
 			if ( eip == fence ) {
 				return -1;