fixing the drand48 problem

Random/Random/RandomFunc.h

 // -*- C++ -*-
-// $Id: RandomFunc.h,v 1.4 2003/10/23 21:29:51 garren Exp $
+// $Id: RandomFunc.h,v 1.4.2.1 2004/04/28 16:04:57 garren Exp $
 // -----------------------------------------------------------------------
 //                             HEP RandomFunc
 //                      get proper system headers for drand, etc.
@@ -43,13 +43,20 @@ extern "C" {
 
 namespace CLHEP {
 
-#ifdef WIN32
-#include "drand48.src"
-#endif  /* WIN32 */
+//#ifdef WIN32
+//#include "drand48.src"
+//#endif  /* WIN32 */
+
+//#ifdef __APPLE__ 
+//#include "drand48.src"
+//#endif  /* __APPLE__ */
 
-#ifdef __APPLE__ 
+// configure checks for drand48
+#ifndef HAVE_DRAND48
+#if !defined(__GNUC__)	// IRIX gets confused
 #include "drand48.src"
-#endif  /* __APPLE__ */
+#endif
+#endif
 
 }  // namespace CLHEP
 

Random/src/RandEngine.cc

-// $Id: RandEngine.cc,v 1.4 2003/08/13 20:00:12 garren Exp $
+// $Id: RandEngine.cc,v 1.4.2.1 2004/04/28 16:04:57 garren Exp $
 // -*- C++ -*-
 //
 // -----------------------------------------------------------------------
@@ -27,9 +27,9 @@
 #include "CLHEP/Random/defs.h"
 #include "CLHEP/Random/RandEngine.h"
 #include "CLHEP/Random/Random.h"
-#include "CLHEP/Random/RandomFunc.h"
 #include <string.h>
 #include <cmath>	// for pow()
+#include <stdlib.h>	// for int()
 
 namespace CLHEP {