Finally kill nbench1.h

git-svn-id: svn://mattst88.com/svn/cleanbench/trunk@29 0d43b9a7-5ab2-4d7b-af9d-f64450cef757

13 files changed, 15 insertions, 51 deletions

diff --git a/assignment.c b/assignment.c
index 2f11ea0..7ce65e0 100644
--- a/assignment.c
+++ b/assignment.c
@@ -7,7 +7,6 @@
 #include <time.h>
 
 #include "nmglobal.h"
-#include "nbench1.h"
 
 
 /*************************
diff --git a/bitfield.c b/bitfield.c
index 4b70206..4b86c11 100644
--- a/bitfield.c
+++ b/bitfield.c
@@ -7,7 +7,6 @@
 #include <time.h>
 
 #include "nmglobal.h"
-#include "nbench1.h"
 
 
 /************************
diff --git a/fourier.c b/fourier.c
index ffa827b..0653b35 100644
--- a/fourier.c
+++ b/fourier.c
@@ -7,7 +7,7 @@
 #include <time.h>
 
 #include "nmglobal.h"
-#include "nbench1.h"
+
 
 /*************************
 ** FOURIER COEFFICIENTS **
diff --git a/fpemulation.c b/fpemulation.c
index 61b016b..e3c7032 100644
--- a/fpemulation.c
+++ b/fpemulation.c
@@ -7,7 +7,6 @@
 #include <time.h>
 
 #include "nmglobal.h"
-#include "nbench1.h"
 #include "emfloat.h"
 
 
diff --git a/huffman.c b/huffman.c
index 97d2c4a..d339b58 100644
--- a/huffman.c
+++ b/huffman.c
@@ -7,7 +7,7 @@
 #include <time.h>
 
 #include "nmglobal.h"
-#include "nbench1.h"
+
 
 /************************
 ** HUFFMAN COMPRESSION **
diff --git a/idea.c b/idea.c
index 16cebfd..aac5190 100644
--- a/idea.c
+++ b/idea.c
@@ -6,7 +6,6 @@
 #include <time.h>
 
 #include "nmglobal.h"
-#include "nbench1.h"
 
 
 /********************
diff --git a/linear.c b/linear.c
index 51b91be..6cef1a9 100644
--- a/linear.c
+++ b/linear.c
@@ -7,7 +7,6 @@
 #include <time.h>
 
 #include "nmglobal.h"
-#include "nbench1.h"
 
 
 /***********************
diff --git a/nbench0.h b/nbench0.h
index b2bad7c..0cfc36d 100644
--- a/nbench0.h
+++ b/nbench0.h
@@ -281,7 +281,7 @@ static void show_stats(int bid);
 /*
 ** EXTERNAL PROTOTYPES
 */
-extern void DoNumSort(void);    /* From NBENCH1 */
+extern void DoNumSort(void);
 extern void DoStringSort(void);
 extern void DoBitops(void);
 extern void DoEmFloat(void);
diff --git a/nbench1.h b/nbench1.h
deleted file mode 100644
index 40ee60f..0000000
--- a/nbench1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-** nbench1.h
-** Header for nbench1.c
-** BYTEmark (tm)
-** BYTE's Native Mode Benchmarks
-** Rick Grehan, BYTE Magazine
-**
-** Creation:
-** Revision: 3/95;10/95
-**
-** DISCLAIMER
-** The source, executable, and documentation files that comprise
-** the BYTEmark benchmarks are made available on an "as is" basis.
-** This means that we at BYTE Magazine have made every reasonable
-** effort to verify that the there are no errors in the source and
-** executable code.  We cannot, however, guarantee that the programs
-** are error-free.  Consequently, McGraw-HIll and BYTE Magazine make
-** no claims in regard to the fitness of the source code, executable
-** code, and documentation of the BYTEmark.
-**  Furthermore, BYTE Magazine, McGraw-Hill, and all employees
-** of McGraw-Hill cannot be held responsible for any damages resulting
-** from the use of this code or the results obtained from using
-** this code.
-*/
-
-/*
-** EXTERNALS
-*/
-extern unsigned long global_min_ticks;
-
-extern SortStruct global_numsortstruct;
-extern SortStruct global_strsortstruct;
-extern BitOpStruct global_bitopstruct;
-extern EmFloatStruct global_emfloatstruct;
-extern FourierStruct global_fourierstruct;
-extern AssignStruct global_assignstruct;
-extern IDEAStruct global_ideastruct;
-extern HuffStruct global_huffstruct;
-extern NNetStruct global_nnetstruct;
-extern LUStruct global_lustruct;
diff --git a/neural.c b/neural.c
index d8ae793..ba875d3 100644
--- a/neural.c
+++ b/neural.c
@@ -7,7 +7,6 @@
 #include <time.h>
 
 #include "nmglobal.h"
-#include "nbench1.h"
 
 
 /********************************
diff --git a/nmglobal.h b/nmglobal.h
index 83a36d8..9a25ac6 100644
--- a/nmglobal.h
+++ b/nmglobal.h
@@ -338,3 +338,15 @@ typedef struct {
         double iterspersec;     /* Results */
 } LUStruct;
 
+extern unsigned long global_min_ticks;
+
+extern SortStruct global_numsortstruct;
+extern SortStruct global_strsortstruct;
+extern BitOpStruct global_bitopstruct;
+extern EmFloatStruct global_emfloatstruct;
+extern FourierStruct global_fourierstruct;
+extern AssignStruct global_assignstruct;
+extern IDEAStruct global_ideastruct;
+extern HuffStruct global_huffstruct;
+extern NNetStruct global_nnetstruct;
+extern LUStruct global_lustruct;
diff --git a/numsort.c b/numsort.c
index 80e492f..57f98d1 100644
--- a/numsort.c
+++ b/numsort.c
@@ -7,7 +7,6 @@
 #include <time.h>
 
 #include "nmglobal.h"
-#include "nbench1.h"
 
 
 /*********************
diff --git a/stringsort.c b/stringsort.c
index cbea030..72f24a3 100644
--- a/stringsort.c
+++ b/stringsort.c
@@ -7,7 +7,6 @@
 #include <time.h>
 
 #include "nmglobal.h"
-#include "nbench1.h"
 
 
 /********************