changeset 2454:848885370fb1

* added config.h to ecattominc * removed minc_globdef.h from Makefile.am
author rotor <rotor>
date Fri, 11 Apr 2008 05:16:02 +0000
parents f5f161c54138
children e30fdeeb284c
files ChangeLog Makefile.am conversion/ecattominc/ecattominc.c
diffstat 3 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-07  Andrew L Janke <a.janke@gmail.com>
+	* conversion/ecattominc/ecattominc.c: added config.h
+	* Makefile.am: removed minc_globdef.h
+	* libsrc/minc_basic.h: rewrote error code to avoid global vars (Claude)
+	* libsrc/minc_error.h: changes for error code (Claude)
+	* libsrc/minc_error.c: changes for error code (Claude)
 
 2008-03-08  Andrew L Janke <a.janke@gmail.com>
 	* progs/mincpik/mincpik: fixed a bug with bar width from Mike Ferreira
--- a/Makefile.am
+++ b/Makefile.am
@@ -413,7 +413,6 @@
 	libsrc/image_conversion.c \
 	libsrc/minc_convenience.c \
 	libsrc/minc_error.c \
-	libsrc/minc_globdef.c \
 	libsrc/nd_loop.c \
 	libsrc/netcdf_convenience.c \
 	libsrc/time_stamp.c \
--- a/conversion/ecattominc/ecattominc.c
+++ b/conversion/ecattominc/ecattominc.c
@@ -10,7 +10,11 @@
 @CREATED    : January 3, 1996 (Peter Neelin)
 @MODIFIED   : 
  * $Log: ecattominc.c,v $
- * Revision 6.6  2008-01-17 02:33:01  rotor
+ * Revision 6.7  2008-04-11 05:16:02  rotor
+ *  * added config.h to ecattominc
+ *  * removed minc_globdef.h from Makefile.am
+ *
+ * Revision 6.6  2008/01/17 02:33:01  rotor
  *  * removed all rcsids
  *  * removed a bunch of ^L's that somehow crept in
  *  * removed old (and outdated) BUGS file
@@ -75,6 +79,10 @@
               express or implied warranty.
 ---------------------------------------------------------------------------- */
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>