Browse Source

Applied patches for BSD OSes

pre-master-46
pnenzi 26 years ago
parent
commit
ccfdf80c2e
  1. 2
      configure.in
  2. 19
      src/frontend/parser/complete.c
  3. 4
      src/include/ngspice.h
  4. 1
      src/maths/cmaths/test_cx_ph.c

2
configure.in

@ -173,7 +173,7 @@ else
fi fi
AC_DEFINE_UNQUOTED(NGSPICEBINDIR, "`echo $dprefix/bin`" ) AC_DEFINE_UNQUOTED(NGSPICEBINDIR, "`echo $dprefix/bin`" )
AC_DEFINE_UNQUOTED(NGSPICEDATADIR, "`echo $dprefix/share/ng-spice`" )
AC_DEFINE_UNQUOTED(NGSPICEDATADIR, "`echo $dprefix/share/ng-spice-rework`" )
AC_DEFINE_UNQUOTED(NGSPICEBUILDDATE, "`date`" ) AC_DEFINE_UNQUOTED(NGSPICEBUILDDATE, "`date`" )

19
src/frontend/parser/complete.c

@ -410,6 +410,11 @@ cp_ccon(bool on)
# else # else
# ifdef HAVE_TERMIOS_H # ifdef HAVE_TERMIOS_H
# ifdef __NetBSD__
# define TCGETS
# define TCSETS
# endif
# define TERM_GET TCGETS # define TERM_GET TCGETS
# define TERM_SET TCSETS # define TERM_SET TCSETS
static struct termios sbuf; static struct termios sbuf;
@ -418,7 +423,7 @@ cp_ccon(bool on)
# endif # endif
# endif # endif
# ifdef TERM_GET
# if defined(TERM_GET) || defined(__NetBSD__)
static bool ison = FALSE; static bool ison = FALSE;
if (cp_nocc || !cp_interactive || (ison == on)) if (cp_nocc || !cp_interactive || (ison == on))
@ -426,14 +431,26 @@ cp_ccon(bool on)
ison = on; ison = on;
if (ison == TRUE) { if (ison == TRUE) {
#ifdef __NetBSD__
tcgetattr(fileno(cp_in),&OS_Buf);
#else
(void) ioctl(fileno(cp_in), TERM_GET, (char *) &OS_Buf); (void) ioctl(fileno(cp_in), TERM_GET, (char *) &OS_Buf);
#endif
sbuf = OS_Buf; sbuf = OS_Buf;
sbuf.c_cc[VEOF] = 0; sbuf.c_cc[VEOF] = 0;
sbuf.c_cc[VEOL] = ESCAPE; sbuf.c_cc[VEOL] = ESCAPE;
sbuf.c_cc[VEOL2] = CNTRL_D; sbuf.c_cc[VEOL2] = CNTRL_D;
#ifdef __NetBSD__
tcsetattr(fileno(cp_in),TCSANOW,&sbuf);
#else
(void) ioctl(fileno(cp_in), TERM_SET, (char *) &sbuf); (void) ioctl(fileno(cp_in), TERM_SET, (char *) &sbuf);
#endif
} else { } else {
#ifdef __NetBSD__
tcsetattr(fileno(cp_in),TCSANOW,&OS_Buf);
#else
(void) ioctl(fileno(cp_in), TERM_SET, (char *) &OS_Buf); (void) ioctl(fileno(cp_in), TERM_SET, (char *) &OS_Buf);
#endif
} }
# endif # endif

4
src/include/ngspice.h

@ -12,6 +12,10 @@
#include <config.h> #include <config.h>
#include <stddef.h> #include <stddef.h>
#ifdef HAVE_LIMITS_H
# include <machine/limits.h>
#endif
#include "memory.h" #include "memory.h"
#include "defines.h" #include "defines.h"
#include "macros.h" #include "macros.h"

1
src/maths/cmaths/test_cx_ph.c

@ -1,5 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <float.h>
#include <config.h> #include <config.h>
#include <memory.h> #include <memory.h>

Loading…
Cancel
Save