luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support cygwin's libncursesw10

Browse source
This commit is contained in:
Christophe Grenier 2010-10-23 20:07:54 +02:00
parent 3a5c21e893
commit 6ce209bd9d
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
INFO
View file

@ -1,3 +1,3 @@
TestDisk & PhotoRec , http://www.cgsecurity.org TestDisk & PhotoRec , http://www.cgsecurity.org
Copyright (C) 1998-2009 Christophe GRENIER <grenier@cgsecurity.org> Copyright (C) 1998-2010 Christophe GRENIER <grenier@cgsecurity.org>

4
configure.ac
View file

@ -4,7 +4,7 @@
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([testdisk],[6.12-WIP],[grenier@cgsecurity.org]) AC_INIT([testdisk],[6.12-WIP],[grenier@cgsecurity.org])
sinclude(acx_pthread.m4) sinclude(acx_pthread.m4)
TESTDISKDATE="September 2010" TESTDISKDATE="October 2010"
AC_SUBST(TESTDISKDATE) AC_SUBST(TESTDISKDATE)
AC_DEFINE_UNQUOTED([TESTDISKDATE],"$TESTDISKDATE",[Date of release]) AC_DEFINE_UNQUOTED([TESTDISKDATE],"$TESTDISKDATE",[Date of release])
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
@ -252,7 +252,7 @@ AC_SYS_LARGEFILE
AC_HEADER_STDC AC_HEADER_STDC
#AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h stdint.h unistd.h]) #AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h stdint.h unistd.h])
AC_HEADER_SYS_WAIT 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). # Check for iconv support (for Unicode conversion).

2
src/intrfn.c
View file

@ -1116,7 +1116,7 @@ int start_ncurses(const char *prog_name, const char *real_prog_name)
{ {
log_critical("Terminfo file is missing.\n"); log_critical("Terminfo file is missing.\n");
#if defined(__CYGWIN__) #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 #else
printf("Terminfo file is missing.\n"); printf("Terminfo file is missing.\n");
#endif #endif

2
src/intrfn.h
View file

@ -29,6 +29,8 @@ extern "C" {
#include <ncurses.h> #include <ncurses.h>
#elif defined(HAVE_NCURSESW_NCURSES_H) #elif defined(HAVE_NCURSESW_NCURSES_H)
#include <ncursesw/ncurses.h> #include <ncursesw/ncurses.h>
#elif defined(HAVE_NCURSESW_CURSES_H)
#include <ncursesw/curses.h>
#elif defined(HAVE_NCURSES_NCURSES_H) #elif defined(HAVE_NCURSES_NCURSES_H)
#include <ncurses/ncurses.h> #include <ncurses/ncurses.h>
#elif defined(HAVE_NCURSES_CURSES_H) #elif defined(HAVE_NCURSES_CURSES_H)