aboutsummaryrefslogtreecommitdiff
path: root/ncurses/base/lib_beep.c
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
committerXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
commit4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (patch)
treeb8f6e12b479a78216f3bffb8e1258d54087268de /ncurses/base/lib_beep.c
parente07762606a5bf651a501cb095c98cba90e4a8fe2 (diff)
Notes
Diffstat (limited to 'ncurses/base/lib_beep.c')
-rw-r--r--ncurses/base/lib_beep.c27
1 files changed, 5 insertions, 22 deletions
diff --git a/ncurses/base/lib_beep.c b/ncurses/base/lib_beep.c
index 9d7f7fd96f01..b478f251a1bb 100644
--- a/ncurses/base/lib_beep.c
+++ b/ncurses/base/lib_beep.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -30,7 +30,6 @@
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
* and: Thomas E. Dickey 1996-on *
- * and: Juergen Pfeifer 2009 *
****************************************************************************/
/*
@@ -41,12 +40,9 @@
*/
#include <curses.priv.h>
+#include <term.h> /* beep, flash */
-#ifndef CUR
-#define CUR SP_TERMTYPE
-#endif
-
-MODULE_ID("$Id: lib_beep.c,v 1.15 2009/10/24 22:02:14 tom Exp $")
+MODULE_ID("$Id: lib_beep.c,v 1.10 2005/04/09 15:20:04 tom Exp $")
/*
* beep()
@@ -57,16 +53,12 @@ MODULE_ID("$Id: lib_beep.c,v 1.15 2009/10/24 22:02:14 tom Exp $")
*/
NCURSES_EXPORT(int)
-NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0)
+beep(void)
{
int res = ERR;
- T((T_CALLED("beep(%p)"), (void *) SP_PARM));
+ T((T_CALLED("beep()")));
-#ifdef USE_TERM_DRIVER
- if (SP_PARM != 0)
- res = CallDriver_1(SP_PARM, doBeepOrFlash, TRUE);
-#else
/* FIXME: should make sure that we are not in altchar mode */
if (cur_term == 0) {
res = ERR;
@@ -79,15 +71,6 @@ NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0)
res = putp(flash_screen);
_nc_flush();
}
-#endif
returnCode(res);
}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(int)
-beep(void)
-{
- return NCURSES_SP_NAME(beep) (CURRENT_SCREEN);
-}
-#endif