$NetBSD: patch-ag,v 1.2 2007/11/07 14:00:54 rillig Exp $

--- cmn/utils.cpp.orig	2007-11-07 14:55:38.000000000 +0100
+++ cmn/utils.cpp	2007-11-07 14:57:57.000000000 +0100
@@ -30,18 +30,20 @@
 
 // Include Files
 #include "stdafx.h"
-#include <iostream.h>
-#include <limits.h>
-#include <string.h>
-#include <ctype.h>
-#include <fstream.h>
+#include <iostream>
+#include <climits>
+#include <cstring>
+#include <cctype>
+#include <fstream>
 #if WIN32
 #include <strstrea.h>
 #endif
 #if X11
-#include <strstream.h>
+#include <strstream>
 #endif
 
+using namespace std;
+
 #ifdef WIN32
 // For file manipulation routines.
 #include <direct.h>
@@ -475,7 +477,7 @@ char* Utils::get_OS_info() {
 #endif
 
 
-#define UNAME_PATH "@UNAME@"
+#define UNAME_PATH "/usr/bin/uname"
 
 #ifdef X11
   FILE* fp = popen(UNAME_PATH " -a","r");
@@ -757,7 +759,7 @@ public:
 
 
 private:
-  Bucket* HashTable::_get(int &index,void* key);
+  Bucket* _get(int &index,void* key);
   /* MODIFIES: index */
   /* EFFECTS: Internal helper function.  Return the Bucket containing key
      or NULL if not found.  Set index to the bucket list for key whether
