update to ng-spice-17

Changes are:

Ng-spice-rework-17
============
This is a bug fix release. Previous release tarball did not included
an include file necessary for compiling numparam library.


Ng-spice-rework-16
============

Rework-16 comes out after almost one year of CVS development (from
15-fixedRC3). This release improves ngspice in three ways:

- Bug fixing: most of the bugs that affected rework-15 have been fixed,
    thus ngspice is more stable, especially the xspice extension, the
    subcircuit (X devices) handling and the numparam library.

- New features: netlist syntax has been expandend allowing for end-of-line
    comments. A ".global" card has beed added to define global nodes, i.e.
    nodes that are not expanded in subcircuits. It is possible to define TC
    for resistors on the instance line. The editline library can be used
    instead of readline (no more GPL license violation).

- Porting: ngspice now works (with xspice extension) on Windows using
           MINGW/MSYS.

11 files changed, 125 insertions, 131 deletions

diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index d12deed0572..a5c7dd76101 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:40 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/11/17 13:17:56 dmcmahill Exp $
 #
 
-DISTNAME=	ng-spice-rework-15c
-PKGNAME=	ng-spice-15c
+DISTNAME=	ng-spice-rework-17
+PKGNAME=	ng-spice-17
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ngspice/}
 
@@ -10,7 +10,7 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://ngspice.sourceforge.net/
 COMMENT=	Next generation circuit simulation program
 
-WRKSRC=			${WRKDIR}/ng-spice-rework-15
+WRKSRC=			${WRKDIR}/ng-spice-rework-17
 USE_LIBTOOL=		YES
 USE_MAKEINFO=		YES
 USE_TOOLS+=		gmake
diff --git a/cad/ng-spice/PLIST b/cad/ng-spice/PLIST
index 8d7f8978451..4e85f979f40 100644
--- a/cad/ng-spice/PLIST
+++ b/cad/ng-spice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/12/02 00:06:40 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/11/17 13:17:56 dmcmahill Exp $
 bin/nghelp
 bin/ngmakeidx
 bin/ngmultidec
@@ -6,6 +6,7 @@ bin/ngnutmeg
 bin/ngproc2mod
 bin/ngsconvert
 bin/ngspice
+lib/ng-spice-rework/libbsim4.a
 man/man1/ngnutmeg.1
 man/man1/ngsconvert.1
 man/man1/ngspice.1
@@ -17,3 +18,4 @@ share/ng-spice-rework/scripts/spinit
 @dirrm share/ng-spice-rework/scripts
 @dirrm share/ng-spice-rework/helpdir
 @dirrm share/ng-spice-rework
+@dirrm lib/ng-spice-rework
diff --git a/cad/ng-spice/distinfo b/cad/ng-spice/distinfo
index 8feb6b19f84..be432505006 100644
--- a/cad/ng-spice/distinfo
+++ b/cad/ng-spice/distinfo
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.9 2005/03/18 22:44:22 dmcmahill Exp $
+$NetBSD: distinfo,v 1.10 2005/11/17 13:17:56 dmcmahill Exp $
 
-SHA1 (ng-spice-rework-15c.tar.gz) = 9cd62308a78134119479afaad620842c0923767c
-RMD160 (ng-spice-rework-15c.tar.gz) = 3099cb6e1f7b9d3411336d134b178467618e2e29
-Size (ng-spice-rework-15c.tar.gz) = 8730359 bytes
-SHA1 (patch-aa) = 4c47a4de66a5b5c0d5bbb253f4c18582caea576c
-SHA1 (patch-ab) = bea9a7f0270ecaa10e58830c724c5e93333f7eb6
-SHA1 (patch-ac) = 319b43356e1b2f37fb21ef8fcdf7f64b405fe810
-SHA1 (patch-ad) = ba849271919d7b4ad03b9773ca0c93d82270b70f
-SHA1 (patch-ae) = b4fc8912efb3277e364af0616f80811ad03df87c
-SHA1 (patch-af) = f6621a9de22818d3f06d0aebc2b0a38791f1bece
+SHA1 (ng-spice-rework-17.tar.gz) = 5ce17a6dff309fae069e0b1e7309eb1c16b4671b
+RMD160 (ng-spice-rework-17.tar.gz) = 2345cbdb608bfb182d33c1a6497408b22acffb77
+Size (ng-spice-rework-17.tar.gz) = 5919637 bytes
+SHA1 (patch-aa) = 2a6706d4ab993b7145307d4cb65a3dc1f1b63147
+SHA1 (patch-ab) = 7c35038ded76ef434572019371af3a3476746501
+SHA1 (patch-ac) = fd7d99226ec6c1b56a0653a15114c726e12d71ef
+SHA1 (patch-ad) = b6d65b7edc4e17180687a8a46573a14615937330
+SHA1 (patch-ae) = 0a238d948c3cafeeda9986c8798a03b213c3aa6f
+SHA1 (patch-af) = d0b29fadc1c2ac56b0f0700e9c822ce9fcb96090
+SHA1 (patch-ag) = 4cc9952823421b57fffb512e6d50483f706a5211
+SHA1 (patch-ah) = f76c5c400ee588f482211997f2d405811b945518
diff --git a/cad/ng-spice/patches/patch-aa b/cad/ng-spice/patches/patch-aa
index d3d9bc6ef0e..723713deafa 100644
--- a/cad/ng-spice/patches/patch-aa
+++ b/cad/ng-spice/patches/patch-aa
@@ -1,24 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2005/03/18 22:44:22 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2005/11/17 13:17:56 dmcmahill Exp $
 
---- src/frontend/aspice.c.orig	2004-08-29 13:54:58.000000000 -0400
-+++ src/frontend/aspice.c
-@@ -176,9 +176,7 @@ sigchild(void)
-  * whether the exit was normal or not.
-  */
+--- src/frontend/com_shell.c.orig	2005-05-30 20:28:30.000000000 +0000
++++ src/frontend/com_shell.c
+@@ -8,7 +8,7 @@
+ #include <wordlist.h>
  
--#if defined(__NetBSD__) || defined(SOLARIS)
--    pid_t status;
--#elif defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__sun__) || defined(__FreeBSD__)
-     int status;    
- #else
-     union wait status;
-@@ -192,7 +190,7 @@ ft_checkkids(void)
-     struct proc *p = NULL, *lp = NULL;
-     char buf[BSIZE_SP];
-     FILE *fp;
--    int pid = 0;
-+    pid_t pid = 0;
-     static bool here = FALSE;   /* Don't want to be re-entrant. */
+ #include "com_shell.h"
+-
++#include "cpextern.h"
+ 
+ /* Fork a shell. */
  
-     if (!numchanged || here)
diff --git a/cad/ng-spice/patches/patch-ab b/cad/ng-spice/patches/patch-ab
index acceb371392..69d43bb7842 100644
--- a/cad/ng-spice/patches/patch-ab
+++ b/cad/ng-spice/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.4 2004/12/02 13:33:32 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.5 2005/11/17 13:17:56 dmcmahill Exp $
 
---- src/Makefile.am.orig	Sat Feb 14 19:19:27 2004
+--- src/Makefile.am.orig	2005-05-20 11:28:03.000000000 +0000
 +++ src/Makefile.am
-@@ -4,7 +4,7 @@ SUBDIRS = misc maths frontend spicelib i
+@@ -3,7 +3,7 @@
+ SUBDIRS = misc maths frontend spicelib include @XSPICEDIR@ @CIDERDIR@
  DIST_SUBDIRS = misc maths frontend spicelib include xspice ciderlib
  
- bin_PROGRAMS =  ngspice ngnutmeg nghelp ngsconvert ngproc2mod ngmultidec \
--	        makeidx
-+	        ngmakeidx
- 
- EXTRA_DIST = ngspice.txt ngspice.idx setplot spectrum \
- 	     devload devaxis ciderinit winmain.c
-@@ -169,14 +169,14 @@ ngmultidec_LDADD =  \
- 	maths/sparse/libsparse.a \
- 	misc/libmisc.a 
+-bin_PROGRAMS =  ngspice ngnutmeg nghelp makeidx
++bin_PROGRAMS =  ngspice ngnutmeg nghelp ngmakeidx
+ 	        	        
+ if !WINDOWS
+ bin_PROGRAMS += ngsconvert ngproc2mod ngmultidec
+@@ -185,14 +185,14 @@ ngmultidec_LDADD =  \
+ 	
+ endif !WINDOWS
  
 -## makeidx:
 +## ngmakeidx:
diff --git a/cad/ng-spice/patches/patch-ac b/cad/ng-spice/patches/patch-ac
index 8ef2e9eecac..1d3a1bbec6c 100644
--- a/cad/ng-spice/patches/patch-ac
+++ b/cad/ng-spice/patches/patch-ac
@@ -1,27 +1,18 @@
-$NetBSD: patch-ac,v 1.4 2004/12/02 13:33:32 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.5 2005/11/17 13:17:56 dmcmahill Exp $
 
---- src/Makefile.in.orig	Mon Sep  6 09:49:02 2004
+--- src/Makefile.in.orig	2005-08-30 07:58:00.000000000 +0000
 +++ src/Makefile.in
-@@ -15,7 +15,7 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(makeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) $(ngnutmeg_SOURCES) $(ngproc2mod_SOURCES) $(ngsconvert_SOURCES) $(ngspice_SOURCES)
-+SOURCES = $(ngmakeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) $(ngnutmeg_SOURCES) $(ngproc2mod_SOURCES) $(ngsconvert_SOURCES) $(ngspice_SOURCES)
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-@@ -40,7 +40,7 @@ POST_UNINSTALL = :
+@@ -38,7 +38,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
  host_triplet = @host@
  bin_PROGRAMS = ngspice$(EXEEXT) ngnutmeg$(EXEEXT) nghelp$(EXEEXT) \
- 	ngsconvert$(EXEEXT) ngproc2mod$(EXEEXT) ngmultidec$(EXEEXT) \
--	makeidx$(EXEEXT)
-+	ngmakeidx$(EXEEXT)
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(srcdir)/spinit.in ChangeLog
-@@ -54,9 +54,9 @@ CONFIG_CLEAN_FILES = spinit
- am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(helpdatadir)" "$(DESTDIR)$(initdatadir)"
+-	makeidx$(EXEEXT) $(am__EXEEXT_1)
++	ngmakeidx$(EXEEXT) $(am__EXEEXT_1)
+ @WINDOWS_FALSE@am__append_1 = ngsconvert ngproc2mod ngmultidec
+ @WINDOWS_TRUE@am__append_2 = winmain.c
+ @WINDOWS_TRUE@am__append_3 = winmain.c
+@@ -59,9 +59,9 @@ am__installdirs = "$(DESTDIR)$(bindir)" 
+ 	"$(DESTDIR)$(initdatadir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  PROGRAMS = $(bin_PROGRAMS)
 -am_makeidx_OBJECTS = makeidx.$(OBJEXT)
@@ -30,41 +21,32 @@ $NetBSD: patch-ac,v 1.4 2004/12/02 13:33:32 dmcmahill Exp $
 +am_ngmakeidx_OBJECTS = makeidx.$(OBJEXT)
 +ngmakeidx_OBJECTS = $(am_ngmakeidx_OBJECTS)
 +ngmakeidx_LDADD = $(LDADD)
- am_nghelp_OBJECTS = nghelp.$(OBJEXT)
- nghelp_OBJECTS = $(am_nghelp_OBJECTS)
- nghelp_DEPENDENCIES = frontend/help/libhlp.a \
-@@ -130,7 +130,7 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(t
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/conf.Po ./$(DEPDIR)/main.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/makeidx.Po ./$(DEPDIR)/nghelp.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/ngmakeidx.Po ./$(DEPDIR)/nghelp.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/ngmultidec.Po ./$(DEPDIR)/ngnutmeg.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/ngproc2mod.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/ngsconvert.Po ./$(DEPDIR)/ngspice.Po
-@@ -142,10 +142,10 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
+ am__nghelp_SOURCES_DIST = conf.c nghelp.c winmain.c
+ @WINDOWS_TRUE@am__objects_1 = winmain.$(OBJEXT)
+ am_nghelp_OBJECTS = conf.$(OBJEXT) nghelp.$(OBJEXT) $(am__objects_1)
+@@ -151,10 +151,10 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
  CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 -SOURCES = $(makeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) \
 +SOURCES = $(ngmakeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) \
  	$(ngnutmeg_SOURCES) $(ngproc2mod_SOURCES) \
  	$(ngsconvert_SOURCES) $(ngspice_SOURCES)
--DIST_SOURCES = $(makeidx_SOURCES) $(nghelp_SOURCES) \
-+DIST_SOURCES = $(ngmakeidx_SOURCES) $(nghelp_SOURCES) \
- 	$(ngmultidec_SOURCES) $(ngnutmeg_SOURCES) \
- 	$(ngproc2mod_SOURCES) $(ngsconvert_SOURCES) $(ngspice_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -416,7 +416,7 @@ ngmultidec_LDADD = \
- 	maths/sparse/libsparse.a \
- 	misc/libmisc.a 
+-DIST_SOURCES = $(makeidx_SOURCES) $(am__nghelp_SOURCES_DIST) \
++DIST_SOURCES = $(ngmakeidx_SOURCES) $(am__nghelp_SOURCES_DIST) \
+ 	$(am__ngmultidec_SOURCES_DIST) $(am__ngnutmeg_SOURCES_DIST) \
+ 	$(am__ngproc2mod_SOURCES_DIST) $(am__ngsconvert_SOURCES_DIST) \
+ 	$(am__ngspice_SOURCES_DIST)
+@@ -427,7 +427,7 @@ nghelp_LDADD = \
+ @WINDOWS_FALSE@	maths/sparse/libsparse.a \
+ @WINDOWS_FALSE@	misc/libmisc.a 
  
 -makeidx_SOURCES = makeidx.c
 +ngmakeidx_SOURCES = makeidx.c
  INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@
  MAINTAINERCLEANFILES = Makefile.in
  all: all-recursive
-@@ -482,9 +482,9 @@ clean-binPROGRAMS:
+@@ -493,9 +493,9 @@ clean-binPROGRAMS:
  	  echo " rm -f $$p $$f"; \
  	  rm -f $$p $$f ; \
  	done
@@ -77,16 +59,7 @@ $NetBSD: patch-ac,v 1.4 2004/12/02 13:33:32 dmcmahill Exp $
  nghelp$(EXEEXT): $(nghelp_OBJECTS) $(nghelp_DEPENDENCIES) 
  	@rm -f nghelp$(EXEEXT)
  	$(LINK) $(nghelp_LDFLAGS) $(nghelp_OBJECTS) $(nghelp_LDADD) $(LIBS)
-@@ -512,7 +512,7 @@ distclean-compile:
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makeidx.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngmakeidx.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghelp.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngmultidec.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngnutmeg.Po@am__quote@
-@@ -858,8 +858,8 @@ winmain.o: winmain.c
+@@ -881,8 +881,8 @@ winmain.o: winmain.c
  spice.o: main.c
  		$(COMPILE) -DSIMULATOR -o spice.o  -c $(srcdir)/main.c
  
diff --git a/cad/ng-spice/patches/patch-ad b/cad/ng-spice/patches/patch-ad
index f09480e5ff1..8474b9c7802 100644
--- a/cad/ng-spice/patches/patch-ad
+++ b/cad/ng-spice/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.5 2004/12/02 13:33:32 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.6 2005/11/17 13:17:56 dmcmahill Exp $
 
---- configure.in.orig	Sun Aug 15 08:51:13 2004
-+++ configure.in
-@@ -161,7 +161,7 @@ fi
- 
- if test "$enable_debug" = "no"; then
- 	AC_MSG_WARN(Removing debugging option!)
--	CFLAGS=" "
-+	CFLAGS="`echo $CFLAGS | sed 's;-g;;g'` "
- fi
+--- src/frontend/terminal.c.orig	2001-04-22 10:08:46.000000000 +0000
++++ src/frontend/terminal.c
+@@ -27,6 +27,8 @@ Author: 1986 Wayne A. Christopher, U. C.
+ #include <termcap.h>
+ #endif
  
++#include <sys/ioctl.h>
++
+ #include <ngspice.h>
+ #include <cpdefs.h>
  
diff --git a/cad/ng-spice/patches/patch-ae b/cad/ng-spice/patches/patch-ae
index ac6817eb0b9..cca022663ae 100644
--- a/cad/ng-spice/patches/patch-ae
+++ b/cad/ng-spice/patches/patch-ae
@@ -1,13 +1,12 @@
-$NetBSD: patch-ae,v 1.5 2004/12/02 13:33:32 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.6 2005/11/17 13:17:56 dmcmahill Exp $
 
---- configure.orig	Mon Sep  6 09:49:40 2004
-+++ configure
-@@ -3295,7 +3295,7 @@ fi
- if test "$enable_debug" = "no"; then
- 	{ echo "$as_me:$LINENO: WARNING: Removing debugging option!" >&5
- echo "$as_me: WARNING: Removing debugging option!" >&2;}
--	CFLAGS=" "
-+	CFLAGS="`echo $CFLAGS | sed 's;-g;;g'` "
- fi
- 
+--- src/makeidx.c.orig	2005-05-19 15:21:59.000000000 +0000
++++ src/makeidx.c
+@@ -5,6 +5,7 @@ Copyright 1990 Regents of the University
+ /* from FILENAME.txt, make FILENAME.idx */
  
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include "cpdefs.h"
+ #include "hlpdefs.h"
diff --git a/cad/ng-spice/patches/patch-af b/cad/ng-spice/patches/patch-af
index 614219a93fa..11902d72251 100644
--- a/cad/ng-spice/patches/patch-af
+++ b/cad/ng-spice/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.2 2004/12/02 13:33:32 dmcmahill Exp $
+$NetBSD: patch-af,v 1.3 2005/11/17 13:17:56 dmcmahill Exp $
 
---- doc/ngspice.texi.orig	Sun Nov  2 14:16:21 2003
+--- doc/ngspice.texi.orig	2005-08-15 22:24:58.000000000 +0000
 +++ doc/ngspice.texi
-@@ -6,6 +6,15 @@
- @c %**end of header
- 
- @ifinfo
+@@ -3,6 +3,15 @@
+ @c %**start of header
+ @setfilename ngspice.info
+ @include version.texi
 +@format
 +INFO-DIR-SECTION Simulation
 +START-INFO-DIR-ENTRY
@@ -15,6 +15,6 @@ $NetBSD: patch-af,v 1.2 2004/12/02 13:33:32 dmcmahill Exp $
 +END-INFO-DIR-ENTRY
 +@end format
 +
- This file documents NGSPICE.
- 
- Copyright 1996 The Regents of the University of California.
+ @settitle NGSPICE User Manual
+ @setchapternewpage odd
+ @c %**end of header
diff --git a/cad/ng-spice/patches/patch-ag b/cad/ng-spice/patches/patch-ag
new file mode 100644
index 00000000000..afac0ef0f4c
--- /dev/null
+++ b/cad/ng-spice/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.3 2005/11/17 13:17:56 dmcmahill Exp $
+
+--- src/frontend/parse.h.orig	2005-05-26 19:29:52.000000000 +0000
++++ src/frontend/parse.h
+@@ -11,7 +11,9 @@
+ #include <wordlist.h>
+ 
+ struct pnode * ft_getpnames(wordlist *wl, bool check);
++#ifndef free_pnode
+ #define free_pnode(ptr)  free_pnode_x(ptr); ptr=NULL;
++#endif
+ void free_pnode_x(struct pnode *t);
+ 
+ 
diff --git a/cad/ng-spice/patches/patch-ah b/cad/ng-spice/patches/patch-ah
new file mode 100644
index 00000000000..28887a7eba4
--- /dev/null
+++ b/cad/ng-spice/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2005/11/17 13:17:56 dmcmahill Exp $
+
+--- src/frontend/display.c.orig	2005-05-31 00:12:18.000000000 +0000
++++ src/frontend/display.c
+@@ -102,8 +102,9 @@ DISPDEVICE device[] = {
+ 
+ DISPDEVICE *dispdev = device + NUMELEMS(device) - 1;
+ 
++#ifndef XtNumber
+ #define XtNumber(arr)       (sizeof(arr) / sizeof(arr[0]))
+-
++#endif
+ 
+ DISPDEVICE *FindDev(char *name)
+ {