summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2010-10-23 20:07:54 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2010-10-23 20:07:54 +0200
commit6ce209bd9d5a74ac15d48505c32bf138128105c9 (patch)
tree02aaac7ff944a190f0087f6ff5a47829e8753536
parent3a5c21e893138124fb5f5e1011f76883f8960e3f (diff)
Support cygwin's libncursesw10
-rw-r--r--INFO2
-rw-r--r--configure.ac4
-rw-r--r--src/intrfn.c2
-rw-r--r--src/intrfn.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/INFO b/INFO
index 5d745f7..48124ab 100644
--- a/INFO
+++ b/INFO
@@ -1,3 +1,3 @@
TestDisk & PhotoRec , http://www.cgsecurity.org
-Copyright (C) 1998-2009 Christophe GRENIER <grenier@cgsecurity.org>
+Copyright (C) 1998-2010 Christophe GRENIER <grenier@cgsecurity.org>
diff --git a/configure.ac b/configure.ac
index b0cbd71..1c8a527 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
AC_PREREQ(2.59)
AC_INIT([testdisk],[6.12-WIP],[grenier@cgsecurity.org])
sinclude(acx_pthread.m4)
-TESTDISKDATE="September 2010"
+TESTDISKDATE="October 2010"
AC_SUBST(TESTDISKDATE)
AC_DEFINE_UNQUOTED([TESTDISKDATE],"$TESTDISKDATE",[Date of release])
AC_CONFIG_AUX_DIR(config)
@@ -252,7 +252,7 @@ AC_SYS_LARGEFILE
AC_HEADER_STDC
#AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h stdint.h unistd.h])
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([byteswap.h curses.h cygwin/fs.h cygwin/version.h dal/file_dal.h dal/file.h ddk/ntddstor.h dirent.h endian.h errno.h fcntl.h features.h giconv.h glob.h iconv.h io.h libgen.h limits.h linux/fs.h linux/hdreg.h linux/types.h locale.h machine/endian.h malloc.h ncurses.h ncurses/curses.h ncurses/ncurses.h ncursesw/ncurses.h ntfs/version.h openssl/md5.h openssl/opensslv.h pwd.h scsi/scsi.h scsi/scsi_ioctl.h scsi/sg.h setjmp.h signal.h stdarg.h sys/cygwin.h sys/disk.h sys/disklabel.h sys/dkio.h sys/endian.h sys/ioctl.h sys/param.h sys/select.h sys/time.h sys/utsname.h sys/vtoc.h time.h utime.h w32api/ddk/ntdddisk.h windef.h windows.h zlib.h])
+AC_CHECK_HEADERS([byteswap.h curses.h cygwin/fs.h cygwin/version.h dal/file_dal.h dal/file.h ddk/ntddstor.h dirent.h endian.h errno.h fcntl.h features.h giconv.h glob.h iconv.h io.h libgen.h limits.h linux/fs.h linux/hdreg.h linux/types.h locale.h machine/endian.h malloc.h ncurses.h ncurses/curses.h ncurses/ncurses.h ncursesw/curses.h ncursesw/ncurses.h ntfs/version.h openssl/md5.h openssl/opensslv.h pwd.h scsi/scsi.h scsi/scsi_ioctl.h scsi/sg.h setjmp.h signal.h stdarg.h sys/cygwin.h sys/disk.h sys/disklabel.h sys/dkio.h sys/endian.h sys/ioctl.h sys/param.h sys/select.h sys/time.h sys/utsname.h sys/vtoc.h time.h utime.h w32api/ddk/ntdddisk.h windef.h windows.h zlib.h])
#--------------------------------------------------------------------
# Check for iconv support (for Unicode conversion).
diff --git a/src/intrfn.c b/src/intrfn.c
index 3cc68d8..47d49fe 100644
--- a/src/intrfn.c
+++ b/src/intrfn.c
@@ -1116,7 +1116,7 @@ int start_ncurses(const char *prog_name, const char *real_prog_name)
{
log_critical("Terminfo file is missing.\n");
#if defined(__CYGWIN__)
- printf("The terminfo file '%s\\c\\cygwin' is missing.\n", terminfo);
+ printf("The terminfo file '%s\\63\\cygwin' is missing.\n", terminfo);
#else
printf("Terminfo file is missing.\n");
#endif
diff --git a/src/intrfn.h b/src/intrfn.h
index 129f7da..a1f98bf 100644
--- a/src/intrfn.h
+++ b/src/intrfn.h
@@ -29,6 +29,8 @@ extern "C" {
#include <ncurses.h>
#elif defined(HAVE_NCURSESW_NCURSES_H)
#include <ncursesw/ncurses.h>
+#elif defined(HAVE_NCURSESW_CURSES_H)
+#include <ncursesw/curses.h>
#elif defined(HAVE_NCURSES_NCURSES_H)
#include <ncurses/ncurses.h>
#elif defined(HAVE_NCURSES_CURSES_H)