pkg://hp67-1.4-1.src.rpm:195638/hp67-1.4-for_egcs.patch  info  downloads

diff -uNr SOURCES/hp67.orig/builtin.cc BUILD/hp67/builtin.cc
--- SOURCES/hp67.orig/builtin.cc	Thu Jan  1 08:00:00 1970
+++ BUILD/hp67/builtin.cc	Sun Jul 19 02:32:51 1998
@@ -0,0 +1,16 @@
+#include "builtin.h"
+
+unsigned int hashpjw(const char* x) // From Dragon book, p436
+{
+  unsigned int h = 0;
+  unsigned int g;
+
+  while (*x != 0)
+  {
+    h = (h << 4) + *x++;
+    if ((g = h & 0xf0000000) != 0)
+      h = (h ^ (g >> 24)) ^ g;
+  }
+  return h;
+}
+
diff -uNr SOURCES/hp67.orig/builtin.h BUILD/hp67/builtin.h
--- SOURCES/hp67.orig/builtin.h	Thu Jan  1 08:00:00 1970
+++ BUILD/hp67/builtin.h	Sun Jul 19 02:32:36 1998
@@ -0,0 +1,6 @@
+#ifndef _builtin_h
+#define _builtin_h 1
+
+unsigned int hashpjw(const char*);
+
+#endif
diff -uNr SOURCES/hp67.orig/calcfloat.cc BUILD/hp67/calcfloat.cc
--- SOURCES/hp67.orig/calcfloat.cc	Sat Jul 18 13:14:14 1998
+++ BUILD/hp67/calcfloat.cc	Sun Jul 19 02:34:51 1998
@@ -1,7 +1,8 @@
 #include <stdio.h>
 #include <math.h>
 #include <float.h>
-#include <builtin.h>
+//#include <builtin.h>
+#include <string.h>
 #include <stdlib.h>
 #include <limits.h>
 
@@ -294,7 +295,7 @@
 
 CalcFloat &CalcFloat::square(void)
 {
-  this->value = sqr(this->value);
+  this->value = pow((this->value),2);
   return *this;
 }
 
diff -uNr SOURCES/hp67.orig/datatypes.H BUILD/hp67/datatypes.H
--- SOURCES/hp67.orig/datatypes.H	Sat Jul 18 13:14:14 1998
+++ BUILD/hp67/datatypes.H	Sun Jul 19 02:54:39 1998
@@ -50,7 +50,7 @@
 // Assignment from double or int
   virtual Arithdatatype &operator= (double from) = 0;
   virtual Arithdatatype &operator= (int from) = 0;
-  virtual Arithdatatype &operator= (Arithdatatype const &from) = 0;
+  virtual Arithdatatype &operator= (Arithdatatype const &from) {}
 
 // Unary + and -
 //  virtual Arithdatatype &operator+ (void) const = 0;
diff -uNr SOURCES/hp67.orig/flags.h BUILD/hp67/flags.h
--- SOURCES/hp67.orig/flags.h	Sat Jul 18 13:14:14 1998
+++ BUILD/hp67/flags.h	Sun Jul 19 02:26:10 1998
@@ -1,7 +1,7 @@
 #ifndef FLAGS_H
 #define FLAGS_H
 
-#include <bool.h>
+//#include <bool.h>
 
 #include "memory.h"
 
diff -uNr SOURCES/hp67.orig/makefile BUILD/hp67/makefile
--- SOURCES/hp67.orig/makefile	Sat Jul 18 13:14:14 1998
+++ BUILD/hp67/makefile	Sun Jul 19 02:54:53 1998
@@ -1,19 +1,20 @@
-CXXFLAGS = -DHAVE_LONG_DOUBLE_LIBM -Wall
+CXXFLAGS = -DHAVE_LONG_DOUBLE_LIBM #-Wall
 LDFLAGS = -lm -lncurses -s
 
-OBJS = main.o hp67funcs.o calcfloat.o progmem.o input.o parsers.o arguments.o
+OBJS = main.o hp67funcs.o calcfloat.o progmem.o input.o parsers.o arguments.o \
+       builtin.o
 
 STATICOBJS = $(OBJS) /usr/lib/libg++.a /usr/lib/libstdc++.a
 STATICLDFLAGS := $(LDFLAGS)
 
-LDFLAGS += -lg++
+#LDFLAGS += -lg++
 
 
 hp67 : $(OBJS)
-	$(CC) $(OBJS) $(LDFLAGS) -o $@
+	$(CXX) $(OBJS) $(LDFLAGS) -o $@
 
 hp67.static : $(STATICOBJS)
-	$(CC) $(STATICOBJS) $(STATICLDFLAGS) -o $@
+	$(CXX) $(STATICOBJS) $(STATICLDFLAGS) -o $@
 
 clean :
 	rm -f *.o core *~
diff -uNr SOURCES/hp67.orig/memory.h BUILD/hp67/memory.h
--- SOURCES/hp67.orig/memory.h	Sat Jul 18 13:14:14 1998
+++ BUILD/hp67/memory.h	Sun Jul 19 02:32:59 1998
@@ -52,7 +52,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <builtin.h>
+#include "builtin.h"
 
 #include "calcfloat.h"
 
@@ -440,7 +440,6 @@
   *label = recently[i]->keyval;
   return &recently[i]->value;
 }
-
 
 #endif  /* !HASHTABLE_H */