diff --git a/ChangeLog b/ChangeLog index 7be8e2f92..e57a43a87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-07-17 Steven Borley + + * src/frontend/resource.c src/frontend/parser/complete.c + src/spicelib/devices/txl/txlload.c : + #ifdef fixes to get ngspice to compile on Mac OSX + 2003-07-16 Vera Albrecht * frontend/{device.c,parse.c,vectors.c,com_compose.c} : diff --git a/src/frontend/parser/complete.c b/src/frontend/parser/complete.c index 0a1857dde..8e4e0d082 100644 --- a/src/frontend/parser/complete.c +++ b/src/frontend/parser/complete.c @@ -412,7 +412,7 @@ cp_ccon(bool on) # else # ifdef HAVE_TERMIOS_H -# ifdef __NetBSD__ +# if defined(__NetBSD__) || defined(__APPLE_CC__) # define TCGETS # define TCSETS # endif @@ -425,7 +425,7 @@ cp_ccon(bool on) # endif # endif -# if defined(TERM_GET) || defined(__NetBSD__) +# if defined(TERM_GET) || defined(__NetBSD__) || defined(__APPLE_CC__) static bool ison = FALSE; if (cp_nocc || !cp_interactive || (ison == on)) @@ -433,7 +433,7 @@ cp_ccon(bool on) ison = on; if (ison == TRUE) { -#ifdef __NetBSD__ +#if defined(__NetBSD__) || defined(__APPLE_CC__) tcgetattr(fileno(cp_in),&OS_Buf); #else (void) ioctl(fileno(cp_in), TERM_GET, (char *) &OS_Buf); @@ -442,13 +442,13 @@ cp_ccon(bool on) sbuf.c_cc[VEOF] = 0; sbuf.c_cc[VEOL] = ESCAPE; sbuf.c_cc[VEOL2] = CNTRL_D; -#ifdef __NetBSD__ +#if defined(__NetBSD__) || defined(__APPLE_CC__) tcsetattr(fileno(cp_in),TCSANOW,&sbuf); #else (void) ioctl(fileno(cp_in), TERM_SET, (char *) &sbuf); #endif } else { -#ifdef __NetBSD__ +#if defined(__NetBSD__) || defined(__APPLE_CC__) tcsetattr(fileno(cp_in),TCSANOW,&OS_Buf); #else (void) ioctl(fileno(cp_in), TERM_SET, (char *) &OS_Buf); diff --git a/src/frontend/resource.c b/src/frontend/resource.c index 33e734722..47f7ddf94 100644 --- a/src/frontend/resource.c +++ b/src/frontend/resource.c @@ -32,7 +32,7 @@ char *enddata; void init_rlimits(void) { -#ifndef __MINGW32__ +#if !defined( __MINGW32__) && !defined(__APPLE_CC__) startdata = (char *) baseaddr( ); enddata = sbrk(0); #else @@ -314,7 +314,7 @@ fault(void) signal(SIGSEGV, (SIGNAL_FUNCTION) fault); /* SysV style */ longjmp(env, 1); } -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && !defined(__APPLE_CC__) static void * baseaddr(void) { diff --git a/src/spicelib/devices/txl/txlload.c b/src/spicelib/devices/txl/txlload.c index 0c73ceec0..50145abc0 100644 --- a/src/spicelib/devices/txl/txlload.c +++ b/src/spicelib/devices/txl/txlload.c @@ -11,7 +11,6 @@ Author: 1992 Charles Hough #include "sperror.h" #include "suffix.h" -VI_list_txl *pool_vi_txl; static double ratio[MAX_CP_TX_LINES]; static int update_cnv_txl(); static VI_list_txl *new_vi_txl();