X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=include%2Fcurses.tail;h=dd38ed4ea9e9bfb67a38dad2cace3fb39c9442e9;hp=66388e395dee51ad46c4001d919213fd800610ef;hb=efd59f16f336b4c4c698ff783e1723f3161026ef;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8

diff --git a/include/curses.tail b/include/curses.tail
index 66388e39..dd38ed4e 100644
--- a/include/curses.tail
+++ b/include/curses.tail
@@ -1,4 +1,9 @@
-/* $Id: curses.tail,v 1.12 2005/03/27 00:09:51 tom Exp $ */
+/* $Id: curses.tail,v 1.15 2007/03/10 17:51:24 tom Exp $ */
+/*
+ * vile:cmode:
+ * This file is part of ncurses, designed to be appended after curses.h.in
+ * (see that file for the relevant copyright).
+ */
 
 /* mouse interface */
 
@@ -148,10 +153,6 @@ extern NCURSES_EXPORT(void) trace (const unsigned int);
 
 #if defined(TRACE) || defined(NCURSES_TEST)
 extern NCURSES_EXPORT_VAR(int) _nc_optimize_enable;		/* enable optimizations */
-#ifdef _XOPEN_SOURCE_EXTENDED
-extern NCURSES_EXPORT(const char *) _nc_viswbuf(const wchar_t *);
-extern NCURSES_EXPORT(const char *) _nc_viswibuf(const wint_t *);
-#endif
 extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
 #define OPTIMIZE_MVCUR		0x01	/* cursor movement optimization */
 #define OPTIMIZE_HASHMAP	0x02	/* diff hashing to detect scrolls */
@@ -161,6 +162,8 @@ extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
 
 #ifdef __cplusplus
 
+#ifndef NCURSES_NOMACROS
+
 /* these names conflict with STL */
 #undef box
 #undef clear
@@ -168,6 +171,8 @@ extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
 #undef move
 #undef refresh
 
+#endif /* NCURSES_NOMACROS */
+
 }
 #endif