Changeset 12875

Timestamp:

Apr 18, 2007, 9:21:46 AM (19 years ago)

Author:

eugene

Message:

dropping non-standard includes

Location:

trunk/Ohana

Files:

• configure.tcsh (modified) (4 diffs)
• src/libohana/include/ohana.h (modified) (2 diffs)
• src/misc/include/missing_protos.h (modified) (2 diffs)
• src/opihi/dimm/sbig/sp_ccdcontrol.c (modified) (1 diff)

trunk/Ohana/configure.tcsh

@@ -186 +186 @@
 set needincs = "$needincs glob.h"
 set needincs = "$needincs jpeglib.h"
-set needincs = "$needincs malloc.h"
 set needincs = "$needincs math.h"
-set needincs = "$needincs memory.h"
 set needincs = "$needincs netdb.h"
 set needincs = "$needincs netinet/ip.h"
@@ -211 +209 @@
 set needincs = "$needincs time.h"
 set needincs = "$needincs unistd.h"
-set needincs = "$needincs values.h"
 set needincs = "$needincs zlib.h"
 
@@ -220 +217 @@
 # set needincs = "$needincs stdarg.h" - from std includes (in gcc path)
 # set needincs = "$needincs varargs.h" - from std includes (in gcc path)
+
+# XXX I was probing for these before, but RHL claims we don't need them.
+# I suspect they may be needed on older systems a la CFHT.
+# set needincs = "$needincs malloc.h"
+# set needincs = "$needincs memory.h"
+# set needincs = "$needincs values.h"
 
 # check the hardware architecture:
@@ -258 +261 @@
    endif
    set syslibpath = "$syslibpath /sw/lib /usr/local/lib/mysql"
-   set sysincpath = "$sysincpath /sw/include /usr/include/sys"
+   set sysincpath = "$sysincpath /sw/include"
    set dlltype = dylib
    breaksw;

trunk/Ohana/src/libohana/include/ohana.h

@@ -1 +1 @@
 # include <stdio.h>
 # include <fcntl.h>
-# include <malloc.h>
 # include <math.h>
 # include <errno.h>
 # include <time.h>
-# include <memory.h>
 # include <stdlib.h>
 # include <string.h>
@@ -18 +16 @@
 # include <readline/history.h>
 # include <readline/readline.h>
+
+// XXX I was including these before, but RHL claims they are not needed
+// # include <malloc.h>
+// # include <memory.h>
 
 /* OHANA included stuff */

trunk/Ohana/src/misc/include/missing_protos.h

@@ -13 +13 @@
  *                    which depends on this file every time we need to add
  *                    a new prototype for the SunOS machines.
- * $Id: missing_protos.h,v 1.1.1.1 2004-11-24 04:39:33 eugene Exp $
+ * $Id: missing_protos.h,v 1.2 2007-04-18 19:21:46 eugene Exp $
  * $Locker:  $
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.1.1.1  2004/11/24 04:39:33  eugene
+ * importing elixir components
+ *
  * Revision 1.1.1.1  2001/07/25 02:59:23  eugene
  * import Ohana
@@ -146 +149 @@
 #include <float.h>             /* for DBL_MIN and DBL_MAX */
 #else
-#include <values.h>
+/* XXX RHL claims values.h is not needed
+ * #include <values.h> */
 #ifndef DBL_MIN
 #define DBL_MIN MINDOUBLE

trunk/Ohana/src/opihi/dimm/sbig/sp_ccdcontrol.c

@@ -6 +6 @@
 #include <time.h>
 #include <fcntl.h>
-#include <values.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include "sbig.h"
 #include "fh/fh.h" /* CFHT FITS Handling library */
+
+// XXX RHL claims this is not needed
+// #include <values.h>
 
 #define N_FITS_ENTRIES 33