Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-01-21 19:27:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename the files of the ncurses interface.

Browse source 
The ncurses.h file could clash with /usr/include/ncurses.h, causing
the build to fail with an unintuitive error message.
This commit is contained in:
Olivier Teulière 2013-04-07 00:16:24 +02:00
parent 4060b20c5b
commit 2fa213a32b
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
po/POTFILES.in
View file

@ -181,8 +181,8 @@ qt/validator_factory.cpp
qt/validator_factory.h qt/validator_factory.h
utils/game_io.cpp utils/game_io.cpp
utils/game_io.h utils/game_io.h
utils/ncurses.cpp utils/curses_intf.cpp
utils/ncurses.h utils/curses_intf.h
# Files generated from the .ui files of Qt designer. # Files generated from the .ui files of Qt designer.
# It works, because Makefile.in.in was patched to support that... # It works, because Makefile.in.in was patched to support that...
qt/ui/arbit_assignments.ui.h qt/ui/arbit_assignments.ui.h

2
utils/Makefile.am
View file

@ -37,7 +37,7 @@ endif
if BUILD_NCURSES if BUILD_NCURSES
bin_PROGRAMS += eliotcurses bin_PROGRAMS += eliotcurses
eliotcurses_SOURCES = ncurses.cpp ncurses.h eliotcurses_SOURCES = curses_intf.cpp curses_intf.h
eliotcurses_LDADD = ../game/libgame.a ../dic/libdic.a @CURSES_LIB@ @LIBINTL@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LIBS@ eliotcurses_LDADD = ../game/libgame.a ../dic/libdic.a @CURSES_LIB@ @LIBINTL@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LIBS@
if WITH_LOGGING if WITH_LOGGING
eliotcurses_LDADD += @LOG4CXX_LIBS@ eliotcurses_LDADD += @LOG4CXX_LIBS@

2
utils/ncurses.cpp → utils/curses_intf.cpp
View file

@ -37,7 +37,7 @@
#include <cwctype> // For iswalnum #include <cwctype> // For iswalnum
#include <algorithm> #include <algorithm>
#include "ncurses.h" #include "curses_intf.h"
#include "dic.h" #include "dic.h"
#include "game_factory.h" #include "game_factory.h"
#include "game_params.h" #include "game_params.h"

4
utils/ncurses.h → utils/curses_intf.h
View file

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*****************************************************************************/ *****************************************************************************/
#ifndef NCURSES_H_ #ifndef CURSES_INTF_H_
#define NCURSES_H_ #define CURSES_INTF_H_
#include "config.h" #include "config.h"