From owner-svn-src-all@FreeBSD.ORG  Thu Feb  4 07:08:07 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3D8831065672;
	Thu,  4 Feb 2010 07:08:07 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E5D28FC16;
	Thu,  4 Feb 2010 07:08:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o14787Gc043171;
	Thu, 4 Feb 2010 07:08:07 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o14787P4043168;
	Thu, 4 Feb 2010 07:08:07 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201002040708.o14787P4043168@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 4 Feb 2010 07:08:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203479 - head/games/morse
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2010 07:08:07 -0000

Author: imp
Date: Thu Feb  4 07:08:06 2010
New Revision: 203479
URL: http://svn.freebsd.org/changeset/base/203479

Log:
  Always compile in the speaker code.  There's little savings by
  omitting it, and other platforms may implement /dev/speaker in the
  future.

Modified:
  head/games/morse/Makefile
  head/games/morse/morse.c

Modified: head/games/morse/Makefile
==============================================================================
--- head/games/morse/Makefile	Thu Feb  4 06:45:14 2010	(r203478)
+++ head/games/morse/Makefile	Thu Feb  4 07:08:06 2010	(r203479)
@@ -4,8 +4,4 @@
 PROG=	morse
 MAN=	morse.6
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-CFLAGS += -DSPEAKER=\"/dev/speaker\"
-.endif
-
 .include <bsd.prog.mk>

Modified: head/games/morse/morse.c
==============================================================================
--- head/games/morse/morse.c	Thu Feb  4 06:45:14 2010	(r203478)
+++ head/games/morse/morse.c	Thu Feb  4 07:08:06 2010	(r203479)
@@ -63,6 +63,9 @@ static const char rcsid[] =
 #include <termios.h>
 #include <unistd.h>
 
+/* Always use the speaker, let the open fail if -p is selected */
+#define SPEAKER "/dev/speaker"
+
 #ifdef SPEAKER
 #include <dev/speaker/speaker.h>
 #endif