aboutsummaryrefslogtreecommitdiff
path: root/form/frm_sub.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 /form/frm_sub.c
parente07762606a5bf651a501cb095c98cba90e4a8fe2 (diff)
downloadsrc-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.tar.gz
src-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.zip
Undo two previous imports which was never done in preparation of doing a
new import.
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=262616
Diffstat (limited to 'form/frm_sub.c')
-rw-r--r--form/frm_sub.c23
1 files changed, 7 insertions, 16 deletions
diff --git a/form/frm_sub.c b/form/frm_sub.c
index 1ab131a593c8..6db0023db1ab 100644
--- a/form/frm_sub.c
+++ b/form/frm_sub.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2003,2004 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 *
@@ -27,12 +27,12 @@
****************************************************************************/
/****************************************************************************
- * Author: Juergen Pfeifer, 1995-1997,2009 *
+ * Author: Juergen Pfeifer, 1995,1997 *
****************************************************************************/
#include "form.priv.h"
-MODULE_ID("$Id: frm_sub.c,v 1.12 2010/01/23 21:14:36 tom Exp $")
+MODULE_ID("$Id: frm_sub.c,v 1.9 2004/12/11 22:13:39 tom Exp $")
/*---------------------------------------------------------------------------
| Facility : libnform
@@ -46,22 +46,13 @@ MODULE_ID("$Id: frm_sub.c,v 1.12 2010/01/23 21:14:36 tom Exp $")
NCURSES_EXPORT(int)
set_form_sub(FORM *form, WINDOW *win)
{
- T((T_CALLED("set_form_sub(%p,%p)"), (void *)form, (void *)win));
+ T((T_CALLED("set_form_sub(%p,%p)"), form, win));
if (form && (form->status & _POSTED))
RETURN(E_POSTED);
- else
- {
-#if NCURSES_SP_FUNCS
- FORM *f = Normalize_Form(form);
- f->sub = win ? win : StdScreen(Get_Form_Screen(f));
- RETURN(E_OK);
-#else
- Normalize_Form(form)->sub = win;
- RETURN(E_OK);
-#endif
- }
+ Normalize_Form(form)->sub = win;
+ RETURN(E_OK);
}
/*---------------------------------------------------------------------------
@@ -77,7 +68,7 @@ form_sub(const FORM *form)
{
const FORM *f;
- T((T_CALLED("form_sub(%p)"), (const void *)form));
+ T((T_CALLED("form_sub(%p)"), form));
f = Normalize_Form(form);
returnWin(Get_Form_Window(f));