ports/104280: [PATCH] Make libmikmod work on amd64

[Dan Ponte]

>Number:         104280
>Category:       ports
>Synopsis:       [PATCH] Make libmikmod work on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 10 23:20:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Dan Ponte
>Release:        FreeBSD 6.2-PRERELEASE amd64
>Organization:
Unix Users Anonymous
>Environment:
System: FreeBSD fez.theamigan.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #17: Wed Sep 27 06:10:55 EDT 2006 root at fez.theamigan.net:/usr/obj/usr/src/sys/FEZ amd64

libmikmod-esound-3.1.11_1 (non esound also affected I'd wager)
>Description:
	mikmod would usually sound like complete and utter crap when I played anything on an amd64 machine, but my i386 machines worked fine. It turns out that only __arch64__ and __alpha were being checked and not __amd64. This fixes it.
>How-To-Repeat:
	Use mikmod.
>Fix:
	Apply these patches.

--- patch-include_mikmod.h.in begins here ---
--- include/mikmod.h.in.orig	Tue Oct 10 19:04:20 2006
+++ include/mikmod.h.in	Tue Oct 10 19:04:32 2006
@@ -85,7 +85,7 @@ typedef char CHAR;
 
 @DOES_NOT_HAVE_SIGNED@
 
-#if defined(__arch64__) || defined(__alpha)
+#if defined(__arch64__) || defined(__alpha) || defined(__amd64)
 /* 64 bit architectures */
 
 typedef signed char     SBYTE;      /* 1 byte, signed */
--- patch-include_mikmod.h.in ends here ---

--- patch-include_mikmod_internals.h begins here ---
--- include/mikmod_internals.h.orig	Tue Oct 10 19:03:44 2006
+++ include/mikmod_internals.h	Tue Oct 10 19:04:47 2006
@@ -50,7 +50,7 @@ extern "C" {
 /*========== More type definitions */
 
 /* SLONGLONG: 64bit, signed */
-#if defined (__arch64__) || defined(__alpha)
+#if defined (__arch64__) || defined(__alpha) || defined(__amd64)
 typedef long		SLONGLONG;
 #define NATIVE_64BIT_INT
 #elif defined(__WATCOMC__)
--- patch-include_mikmod_internals.h ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: