[Cscope-cvs] CVS: cscope/src constants.h,1.12,1.13

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5128/src

Modified Files:
	constants.h 
Log Message:
Turn on TERMINFO for FreeBSD.

Index: constants.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/constants.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** constants.h	11 Jul 2002 14:23:45 -0000	1.12
--- constants.h	30 Apr 2004 15:28:25 -0000	1.13
***************
*** 55,64 ****
  /* note that blockp is assumed not to be null */
  #define	getrefchar()	(*(++blockp + 1) != '\0' ? *blockp : \
! 			(readblock() != NULL ? *blockp : '\0'))
  
  /* skip the next character in the cross-reference */
  /* note that blockp is assumed not to be null and that
     this macro will always be in a statement by itself */
! #define	skiprefchar()	if (*(++blockp + 1) == '\0') (void) readblock()
  
  #define	ESC	'\033'		/* escape character */
--- 55,64 ----
  /* note that blockp is assumed not to be null */
  #define	getrefchar()	(*(++blockp + 1) != '\0' ? *blockp : \
! 			(read_block() != NULL ? *blockp : '\0'))
  
  /* skip the next character in the cross-reference */
  /* note that blockp is assumed not to be null and that
     this macro will always be in a statement by itself */
! #define	skiprefchar()	if (*(++blockp + 1) == '\0') (void) read_block()
  
  #define	ESC	'\033'		/* escape character */
***************
*** 96,132 ****
  #define	FIELDS		9
  
! #if (BSD || V9) && !__NetBSD__
! #define TERMINFO	0	/* no terminfo curses */
  #else
! #define TERMINFO	1
  #endif
  
  
- #ifndef __FreeBSD__	/* Prevent search issues in cscope.out */
  #if !TERMINFO
! #ifndef KEY_BREAK
! #define	KEY_BREAK	0400	/* easier to define than to add #if around the use */
! #endif
! #ifndef KEY_ENTER
! #define	KEY_ENTER	0401
! #endif
! #ifndef KEY_BACKSPACE
! #define	KEY_BACKSPACE	0402
! #endif
! 
! #if !sun
! #define cbreak()	crmode()			/* name change */
! #endif
! 
! #if UNIXPC
! #define	erasechar()	(_tty.c_cc[VERASE])		/* equivalent */
! #define	killchar()	(_tty.c_cc[VKILL])		/* equivalent */
! #else
! #define	erasechar()	(_tty.sg_erase)			/* equivalent */
! #define	killchar()	(_tty.sg_kill)			/* equivalent */
! #endif	/* if UNIXPC */
! 
  #endif	/* if !TERMINFO */
- #endif	/* ifndef __FreeBSD__ */
  
  #endif /* CSCOPE_CONSTANTS_H */
--- 96,129 ----
  #define	FIELDS		9
  
! #if (BSD || V9) && !__NetBSD__ && !__FreeBSD__
! # define TERMINFO	0	/* no terminfo curses */
  #else
! # define TERMINFO	1
  #endif
  
  
  #if !TERMINFO
! # ifndef KEY_BREAK
! #  define	KEY_BREAK	0400	/* easier to define than to add #if around the use */
! # endif
! # ifndef KEY_ENTER
! #  define	KEY_ENTER	0401
! # endif
! # ifndef KEY_BACKSPACE
! #  define	KEY_BACKSPACE	0402
! # endif
! 
! # if !sun
! #  define cbreak()	crmode()			/* name change */
! # endif
! 
! # if UNIXPC
! #  define erasechar() (_tty.c_cc[VERASE])		/* equivalent */
! #  define killchar()  (_tty.c_cc[VKILL])		/* equivalent */
! # else
! #  define erasechar() (_tty.sg_erase)			/* equivalent */
! #  define killchar()  (_tty.sg_kill)			/* equivalent */
! # endif /* if UNIXPC */
  #endif	/* if !TERMINFO */
  
  #endif /* CSCOPE_CONSTANTS_H */