Use the single-instance define as the outermost non-comment element

(outside of the extern "C"), as with curses.h.
This commit is contained in:
William McBrine
2007-06-01 02:38:52 +00:00
parent 3b440672ed
commit d9a8eaa43a
2 changed files with 12 additions and 12 deletions

12
panel.h
View File

@@ -11,12 +11,15 @@
* See the file maintain.er for details of the current maintainer. *
************************************************************************/
/* $Id: panel.h,v 1.15 2006/10/15 02:42:24 wmcbrine Exp $ */
/* $Id: panel.h,v 1.16 2007/06/01 02:38:52 wmcbrine Exp $ */
/*----------------------------------------------------------------------*
* Panels for PDCurses *
*----------------------------------------------------------------------*/
#ifndef __PDCURSES_PANEL_H__
#define __PDCURSES_PANEL_H__ 1
#include <curses.h>
#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS)
@@ -24,9 +27,6 @@ extern "C"
{
#endif
#ifndef __PDCURSES_PANEL_H__
#define __PDCURSES_PANEL_H__ 1
typedef struct panelobs
{
struct panelobs *above;
@@ -62,8 +62,8 @@ const void *panel_userptr(const PANEL *pan);
int move_panel(PANEL *pan, int starty, int startx);
int replace_panel(PANEL *pan, WINDOW *win);
#endif /* __PDCURSES_PANEL_H__ */
#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS)
}
#endif
#endif /* __PDCURSES_PANEL_H__ */

12
term.h
View File

@@ -11,13 +11,16 @@
* See the file maintain.er for details of the current maintainer. *
************************************************************************/
/* $Id: term.h,v 1.13 2007/05/16 07:16:31 wmcbrine Exp $ */
/* $Id: term.h,v 1.14 2007/06/01 02:38:52 wmcbrine Exp $ */
/* PDCurses doesn't operate with terminfo, but we need these functions for
compatibility, to allow some things (notably, interface libraries for
other languages) to be compiled. Anyone who tries to actually _use_
them will be disappointed, since they only return ERR. */
#ifndef __PDCURSES_TERM_H__
#define __PDCURSES_TERM_H__ 1
#include <curses.h>
#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS)
@@ -25,9 +28,6 @@ extern "C"
{
#endif
#ifndef __PDCURSES_TERM_H__
#define __PDCURSES_TERM_H__ 1
typedef struct
{
const char *_termname;
@@ -61,8 +61,8 @@ char *tparm(const char *, long, long, long, long, long,
long, long, long, long);
int tputs(const char *, int, int (*)(int));
#endif /* __PDCURSES_TERM_H__ */
#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS)
}
#endif
#endif /* __PDCURSES_TERM_H__ */