From 865ae479ee8f3a315dde774a69c67ca3bccfd425 Mon Sep 17 00:00:00 2001
From: salo <salo>
Date: Fri, 30 Jul 2004 09:57:54 +0000
Subject: Fix multiline strings to get further with gcc3.x

---
 multimedia/avifile/distinfo         |  4 ++--
 multimedia/avifile/patches/patch-am | 34 +++++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 5 deletions(-)

(limited to 'multimedia/avifile')

diff --git a/multimedia/avifile/distinfo b/multimedia/avifile/distinfo
index 4519c8431c7..6b8e19b4095 100644
--- a/multimedia/avifile/distinfo
+++ b/multimedia/avifile/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/26 15:11:46 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/07/30 09:57:54 salo Exp $
 
 SHA1 (avifile-0.53.5.tar.gz) = bc9d27c65ab4f8df9006c6037d539ff71adb0ad7
 Size (avifile-0.53.5.tar.gz) = 848382 bytes
@@ -13,7 +13,7 @@ SHA1 (patch-ai) = fb735fb071ad6bddce0520f55f266e8c05b1ef34
 SHA1 (patch-aj) = 9fac29acf89aa99f546581ecb7b800029643297f
 SHA1 (patch-ak) = f16d6fd4192f74d2f2eb67bc41672e41c6cfba48
 SHA1 (patch-al) = 218f2f2da4ad82ccced63ad00873f186f9924201
-SHA1 (patch-am) = 8c9ffd2dc38ed38058102afa0af13258f89415d4
+SHA1 (patch-am) = 455dd9d3bfc10572ce85fd1015ccd09b3f9a067e
 SHA1 (patch-an) = 3e9857a9e52fce6f51d7cdf99db82b48fc4cbfe9
 SHA1 (patch-ao) = 01e418460da9ffa59b0d1799845049a8aa4bf7c9
 SHA1 (patch-ap) = fd8b4ec6e53ef4ef87983fc63bd7636c7653ebe4
diff --git a/multimedia/avifile/patches/patch-am b/multimedia/avifile/patches/patch-am
index a553f812f67..5c3cf9905b1 100644
--- a/multimedia/avifile/patches/patch-am
+++ b/multimedia/avifile/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.1.1.1 2004/01/26 15:11:49 jmmv Exp $
+$NetBSD: patch-am,v 1.2 2004/07/30 09:57:54 salo Exp $
 
---- lib/loader/win32.c.orig	Wed Jan 31 21:23:25 2001
-+++ lib/loader/win32.c
+--- lib/loader/win32.c.orig	2001-01-31 21:23:25.000000000 +0100
++++ lib/loader/win32.c	2004-07-30 11:54:45.000000000 +0200
 @@ -696,7 +696,7 @@
  	cachedsi.wProcessorLevel		= 5; /* pentium */
  	cachedsi.wProcessorRevision		= 0x0101;
@@ -11,3 +11,31 @@ $NetBSD: patch-am,v 1.1.1.1 2004/01/26 15:11:49 jmmv Exp $
          cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM;
          cachedsi.wProcessorLevel= 5;
  	PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE;
+@@ -1094,11 +1094,11 @@
+ {
+ #warning FIXME
+     if(s1)
+-    dbgprintf("MultiByteToWideChar(codepage %d, flags 0x%x, string 0x%x='%s',
++    dbgprintf("MultiByteToWideChar(codepage %d, flags 0x%x, string 0x%x='%s', \
+ 	size %d, dest buffer 0x%x, dest size %d) => 1 ( L\"\\0\" )\n",
+ 	    v1, v2, s1, s1, siz1, s2, siz2);
+     else
+-    dbgprintf("MultiByteToWideChar(codepage %d, flags 0x%x, string NULL,
++    dbgprintf("MultiByteToWideChar(codepage %d, flags 0x%x, string NULL, \
+ 	size %d, dest buffer 0x%x, dest size %d) => 1 ( L\"\\0\" )\n",
+ 	    v1, v2, siz1, s2, siz2);
+     
+@@ -1605,11 +1605,11 @@
+ {
+     long result=CreateFileMappingA(hFile, lpAttr, flProtect, dwMaxHigh, dwMaxLow, name);
+     if(!name)
+-    dbgprintf("CreateFileMappingA(file 0x%x, lpAttr 0x%x, 
++    dbgprintf("CreateFileMappingA(file 0x%x, lpAttr 0x%x, \
+ 	flProtect 0x%x, dwMaxHigh 0x%x, dwMaxLow 0x%x, name 0) => %d\n",
+ 	    hFile, lpAttr, flProtect, dwMaxHigh, dwMaxLow, result);
+     else
+-    dbgprintf("CreateFileMappingA(file 0x%x, lpAttr 0x%x, 
++    dbgprintf("CreateFileMappingA(file 0x%x, lpAttr 0x%x, \
+ 	flProtect 0x%x, dwMaxHigh 0x%x, dwMaxLow 0x%x, name 0x%x='%s') => %d\n",
+ 	    hFile, lpAttr, flProtect, dwMaxHigh, dwMaxLow, name, name, result);    
+     return result;
-- 
cgit v1.2.3