[eso-midas] 02/06: Imported Upstream version 15.02pl1.2
Ole Streicher
olebole at moszumanska.debian.org
Fri May 22 10:48:28 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository eso-midas.
commit 137b3e894819bde1d058d589236651efe4c7a746
Author: Ole Streicher <olebole at debian.org>
Date: Fri May 22 08:57:27 2015 +0200
Imported Upstream version 15.02pl1.2
---
applic/display/src/makefile.com | 2 +-
applic/fit/libsrc/makefile.com | 2 +-
applic/fit/src/makefile.com | 2 +-
applic/general/libsrc/makefile.com | 2 +-
applic/general/src/makefile.com | 2 +-
applic/plot/libsrc/makefile.com | 2 +-
applic/plot/src/makefile.com | 2 +-
applic/statist/libsrc/makefile.com | 2 +-
applic/statist/src/makefile.com | 2 +-
applic/table/src/makefile.com | 2 +-
contrib/astromet/libsrc/makefile.com | 2 +-
contrib/astromet/src/makefile.com | 2 +-
contrib/cloud/src/makefile.com | 2 +-
contrib/daophot/libsrc/makefile.com | 2 +-
contrib/daophot/src/makefile.com | 2 +-
contrib/esolv/libsrc/makefile.com | 2 +-
contrib/esolv/src/makefile.com | 2 +-
contrib/geotest/src/makefile.com | 2 +-
contrib/imres/libsrc/makefile.com | 2 +-
contrib/imres/src/makefile.com | 2 +-
contrib/invent/libsrc/makefile.com | 2 +-
contrib/invent/src/makefile.com | 2 +-
contrib/iue/libsrc/makefile.com | 2 +-
contrib/iue/src/makefile.com | 2 +-
contrib/lyman/src/makefile.com | 2 +-
contrib/mva/libsrc/makefile.com | 2 +-
contrib/mva/src/makefile.com | 2 +-
contrib/pepsys/libsrc/makefile.com | 2 +-
contrib/pepsys/src/makefile.com | 2 +-
contrib/rgb/src/makefile.com | 2 +-
contrib/romafot/libsrc/makefile.com | 2 +-
contrib/romafot/src/makefile.com | 2 +-
contrib/surfphot/libsrc/makefile.com | 2 +-
contrib/surfphot/src/makefile.com | 2 +-
contrib/template/libsrc/makefile.com | 2 +-
contrib/template/src/makefile.com | 2 +-
contrib/tsa/libsrc/makefile.com | 2 +-
contrib/tsa/src/makefile.com | 2 +-
contrib/wavelet/libsrc/makefile.com | 2 +-
contrib/wavelet/src/makefile.com | 2 +-
gui/GraphLib/libsrc/Comm/makefile.com | 2 +-
gui/GraphLib/libsrc/uimxR5/src/filepath.c | 2 +-
gui/GraphLib/libsrc/uimxR5/src/makefile.com | 2 +-
gui/GraphLib/libsrc/uimxR5/src/sp_utils.c | 17 +--
gui/XDo/src/applic.c | 4 +-
incl/mutil.h | 16 +-
incl/proto_os.h | 1 +
lib/makefile | 2 +-
libsrc/agl/makefile.com | 2 +-
libsrc/astro/makefile.com | 2 +-
libsrc/display/makefile.com | 2 +-
libsrc/ftoc-new/sti.fc | 4 +-
libsrc/ftoc-new/ystk.for | 2 +-
libsrc/ftoc-old/makefile.com | 2 +-
libsrc/idi/cidi/makefile.com | 2 +-
libsrc/idi/cidi/x11/makefile.com | 2 +-
libsrc/idi/fidi/deanza/makefile.com | 2 +-
libsrc/idi/fidi/makefile.com | 2 +-
libsrc/idi/fidi/newdev/makefile.com | 2 +-
libsrc/idi/fidi/nodeanza/makefile.com | 2 +-
libsrc/idi/fnidi/makefile.com | 2 +-
libsrc/math/heapsort.c | 225 ++++++++--------------------
libsrc/math/heapsort.h | 108 +++++++++++++
libsrc/math/makefile.com | 2 +-
libsrc/math/mutil.c | 1 -
libsrc/nag/makefile.com | 2 +-
libsrc/os/vms/makefile.com | 2 +-
libsrc/plot/makefile.com | 2 +-
libsrc/st/makefile.com | 2 +-
libsrc/st/midfct.c | 3 +-
libsrc/st/scc.c | 4 +-
libsrc/st/scdx.c | 12 +-
libsrc/st/scfa.c | 11 +-
libsrc/st/scfb.c | 33 ++--
libsrc/tbl/makefile.com | 2 +-
libsrc/tw/makefile.com | 2 +-
libsrc/xcon/makefile.com | 2 +-
monit/makefile.com | 2 +-
monit/syskeys.datorg | 2 +-
prim/dio/libsrc/fitsrhd.c | 4 +-
prim/dio/libsrc/makefile.com | 2 +-
prim/dio/src/makefile.com | 2 +-
prim/display/libsrc/makefile.com | 2 +-
prim/display/src/makefile.com | 2 +-
prim/display/src/statis.for | 2 +-
prim/edit/libsrc/makefile.com | 2 +-
prim/general/libsrc/cextrco.c | 5 +-
prim/general/libsrc/makefile.com | 2 +-
prim/general/libsrc/md5.c | 2 +-
prim/general/src/makefile.com | 2 +-
prim/plot/libsrc/makefile.com | 2 +-
prim/plot/src/makefile.com | 2 +-
prim/plot/src/modgcur.c | 2 +-
prim/table/libsrc/makefile.com | 2 +-
prim/table/libsrc/tbmerge.c | 2 +-
prim/table/src/makefile.com | 2 +-
prim/tc3/libsrc/makefile.com | 2 +-
prim/tw3/libsrc/makefile.com | 2 +-
prim/tw3/libsrc/thelp.c | 2 +-
stdred/ccdred/libsrc/makefile.com | 2 +-
stdred/ccdred/src/makefile.com | 2 +-
stdred/ccdtest/src/makefile.com | 2 +-
stdred/do/libsrc/makefile.com | 2 +-
stdred/do/libsrc/ostcrea.c | 2 +-
stdred/do/src/makefile.com | 2 +-
stdred/echelle/libsrc/makefile.com | 2 +-
stdred/echelle/src/makefile.com | 2 +-
stdred/echelle/src/neciden.for | 2 +-
stdred/feros/incl/u_const.h | 1 -
stdred/feros/libsrc/glsp.c | 15 +-
stdred/feros/libsrc/makefile.com | 2 +-
stdred/feros/src/makefile.com | 2 +-
stdred/irac2/src/makefile.com | 2 +-
stdred/irspec/src/makefile.com | 2 +-
stdred/long/src/makefile.com | 2 +-
stdred/mmf/src/makefile.com | 2 +-
stdred/mos/libsrc/makefile.com | 2 +-
stdred/mos/libsrc/misc.c | 4 +-
stdred/mos/src/makefile.com | 2 +-
stdred/optopus/libsrc/makefile.com | 2 +-
stdred/optopus/src/makefile.com | 2 +-
stdred/spec/libsrc/makefile.com | 2 +-
stdred/spec/src/makefile.com | 2 +-
system/ext/putline.c | 3 +-
system/ftoc-new/for_generic.for | 2 +-
system/ftoc-new/ftoc_generic.fc | 2 +-
system/idiserv/libsrc/makefile.com | 2 +-
system/idiserv/src/makefile.com | 2 +-
system/machine/computer.c | 1 +
system/vms/tapeio/makefile.com | 2 +-
test/fits/makefile.com | 2 +-
test/prim/verify14.prg | 4 +-
util/bdf2ps/makefile.com | 2 +-
util/libsrc/makefile.com | 2 +-
util/ltape/makefile.com | 2 +-
135 files changed, 354 insertions(+), 350 deletions(-)
diff --git a/applic/display/src/makefile.com b/applic/display/src/makefile.com
index 7f814d3..1097c5d 100644
--- a/applic/display/src/makefile.com
+++ b/applic/display/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.APPLIC.DISPLAY.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:55 UTC 2015
+$ ! .DATE Thu May 21 14:15:38 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/applic/fit/libsrc/makefile.com b/applic/fit/libsrc/makefile.com
index 765a4ca..a8e9307 100644
--- a/applic/fit/libsrc/makefile.com
+++ b/applic/fit/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.APPLIC.FIT.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:54 UTC 2015
+$ ! .DATE Thu May 21 14:15:37 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/applic/fit/src/makefile.com b/applic/fit/src/makefile.com
index 79e75f7..b2b085f 100644
--- a/applic/fit/src/makefile.com
+++ b/applic/fit/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.APPLIC.FIT.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:54 UTC 2015
+$ ! .DATE Thu May 21 14:15:37 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/applic/general/libsrc/makefile.com b/applic/general/libsrc/makefile.com
index ce95504..b52fecb 100644
--- a/applic/general/libsrc/makefile.com
+++ b/applic/general/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.APPLIC.GENERAL.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:56 UTC 2015
+$ ! .DATE Thu May 21 14:15:39 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/applic/general/src/makefile.com b/applic/general/src/makefile.com
index a18c687..2633132 100644
--- a/applic/general/src/makefile.com
+++ b/applic/general/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.APPLIC.GENERAL.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:55 UTC 2015
+$ ! .DATE Thu May 21 14:15:39 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/applic/plot/libsrc/makefile.com b/applic/plot/libsrc/makefile.com
index 278cf2f..6cca844 100644
--- a/applic/plot/libsrc/makefile.com
+++ b/applic/plot/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.APPLIC.PLOT.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:56 UTC 2015
+$ ! .DATE Thu May 21 14:15:39 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/applic/plot/src/makefile.com b/applic/plot/src/makefile.com
index 57307c7..a1ebbe2 100644
--- a/applic/plot/src/makefile.com
+++ b/applic/plot/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.APPLIC.PLOT.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:56 UTC 2015
+$ ! .DATE Thu May 21 14:15:39 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/applic/statist/libsrc/makefile.com b/applic/statist/libsrc/makefile.com
index ad57b50..3d6a69b 100644
--- a/applic/statist/libsrc/makefile.com
+++ b/applic/statist/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.APPLIC.STATIST.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:55 UTC 2015
+$ ! .DATE Thu May 21 14:15:39 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/applic/statist/src/makefile.com b/applic/statist/src/makefile.com
index 6ef5ff9..bc5670b 100644
--- a/applic/statist/src/makefile.com
+++ b/applic/statist/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.APPLIC.STATIST.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:55 UTC 2015
+$ ! .DATE Thu May 21 14:15:39 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/applic/table/src/makefile.com b/applic/table/src/makefile.com
index 663c881..915a19e 100644
--- a/applic/table/src/makefile.com
+++ b/applic/table/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.APPLIC.TABLE.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:55 UTC 2015
+$ ! .DATE Thu May 21 14:15:38 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/astromet/libsrc/makefile.com b/contrib/astromet/libsrc/makefile.com
index d0ab2c1..ca2e78a 100644
--- a/contrib/astromet/libsrc/makefile.com
+++ b/contrib/astromet/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.ASTROMET.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:48 UTC 2015
+$ ! .DATE Thu May 21 14:15:31 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/astromet/src/makefile.com b/contrib/astromet/src/makefile.com
index e0fdc09..6833dfd 100644
--- a/contrib/astromet/src/makefile.com
+++ b/contrib/astromet/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.ASTROMET.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:48 UTC 2015
+$ ! .DATE Thu May 21 14:15:31 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/cloud/src/makefile.com b/contrib/cloud/src/makefile.com
index 5a41062..f293bb1 100644
--- a/contrib/cloud/src/makefile.com
+++ b/contrib/cloud/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.CLOUD.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:49 UTC 2015
+$ ! .DATE Thu May 21 14:15:33 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/daophot/libsrc/makefile.com b/contrib/daophot/libsrc/makefile.com
index 286439e..f60ad63 100644
--- a/contrib/daophot/libsrc/makefile.com
+++ b/contrib/daophot/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.DAOPHOT.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:48 UTC 2015
+$ ! .DATE Thu May 21 14:15:31 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/daophot/src/makefile.com b/contrib/daophot/src/makefile.com
index e5cfe75..512242b 100644
--- a/contrib/daophot/src/makefile.com
+++ b/contrib/daophot/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.DAOPHOT.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:48 UTC 2015
+$ ! .DATE Thu May 21 14:15:31 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/esolv/libsrc/makefile.com b/contrib/esolv/libsrc/makefile.com
index 185c176..247585f 100644
--- a/contrib/esolv/libsrc/makefile.com
+++ b/contrib/esolv/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.ESOLV.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:47 UTC 2015
+$ ! .DATE Thu May 21 14:15:31 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/esolv/src/makefile.com b/contrib/esolv/src/makefile.com
index 7449b4c..cd51841 100644
--- a/contrib/esolv/src/makefile.com
+++ b/contrib/esolv/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.ESOLV.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:47 UTC 2015
+$ ! .DATE Thu May 21 14:15:31 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/geotest/src/makefile.com b/contrib/geotest/src/makefile.com
index e3a9197..3bed25d 100644
--- a/contrib/geotest/src/makefile.com
+++ b/contrib/geotest/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.GEOTEST.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:50 UTC 2015
+$ ! .DATE Thu May 21 14:15:33 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/imres/libsrc/makefile.com b/contrib/imres/libsrc/makefile.com
index ec03d87..27c199a 100644
--- a/contrib/imres/libsrc/makefile.com
+++ b/contrib/imres/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.IMRES.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:45 UTC 2015
+$ ! .DATE Thu May 21 14:15:29 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/imres/src/makefile.com b/contrib/imres/src/makefile.com
index b851c17..39bbc42 100644
--- a/contrib/imres/src/makefile.com
+++ b/contrib/imres/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.IMRES.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:45 UTC 2015
+$ ! .DATE Thu May 21 14:15:29 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/invent/libsrc/makefile.com b/contrib/invent/libsrc/makefile.com
index 894dd94..9486ec4 100644
--- a/contrib/invent/libsrc/makefile.com
+++ b/contrib/invent/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.INVENT.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:48 UTC 2015
+$ ! .DATE Thu May 21 14:15:32 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/invent/src/makefile.com b/contrib/invent/src/makefile.com
index 1f197e3..59e74f6 100644
--- a/contrib/invent/src/makefile.com
+++ b/contrib/invent/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.INVENT.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:48 UTC 2015
+$ ! .DATE Thu May 21 14:15:32 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/iue/libsrc/makefile.com b/contrib/iue/libsrc/makefile.com
index aeb7fa9..74fa1e4 100644
--- a/contrib/iue/libsrc/makefile.com
+++ b/contrib/iue/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.IUE.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:46 UTC 2015
+$ ! .DATE Thu May 21 14:15:29 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/iue/src/makefile.com b/contrib/iue/src/makefile.com
index 11165b0..ce9fad6 100644
--- a/contrib/iue/src/makefile.com
+++ b/contrib/iue/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.IUE.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:46 UTC 2015
+$ ! .DATE Thu May 21 14:15:29 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/lyman/src/makefile.com b/contrib/lyman/src/makefile.com
index fc9b8e4..c0c1948 100644
--- a/contrib/lyman/src/makefile.com
+++ b/contrib/lyman/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.LYMAN.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:46 UTC 2015
+$ ! .DATE Thu May 21 14:15:29 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/mva/libsrc/makefile.com b/contrib/mva/libsrc/makefile.com
index 31c00e3..b31bf3e 100644
--- a/contrib/mva/libsrc/makefile.com
+++ b/contrib/mva/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.MVA.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:46 UTC 2015
+$ ! .DATE Thu May 21 14:15:29 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/mva/src/makefile.com b/contrib/mva/src/makefile.com
index d0b87e5..e92a2f4 100644
--- a/contrib/mva/src/makefile.com
+++ b/contrib/mva/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.MVA.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:46 UTC 2015
+$ ! .DATE Thu May 21 14:15:29 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/pepsys/libsrc/makefile.com b/contrib/pepsys/libsrc/makefile.com
index 39bcc31..5f76875 100644
--- a/contrib/pepsys/libsrc/makefile.com
+++ b/contrib/pepsys/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.PEPSYS.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:47 UTC 2015
+$ ! .DATE Thu May 21 14:15:30 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/pepsys/src/makefile.com b/contrib/pepsys/src/makefile.com
index 799d1e2..84c6460 100644
--- a/contrib/pepsys/src/makefile.com
+++ b/contrib/pepsys/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.PEPSYS.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:46 UTC 2015
+$ ! .DATE Thu May 21 14:15:30 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/rgb/src/makefile.com b/contrib/rgb/src/makefile.com
index afaf00b..d16fa1f 100644
--- a/contrib/rgb/src/makefile.com
+++ b/contrib/rgb/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.RGB.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:50 UTC 2015
+$ ! .DATE Thu May 21 14:15:34 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/romafot/libsrc/makefile.com b/contrib/romafot/libsrc/makefile.com
index aa34833..893a224 100644
--- a/contrib/romafot/libsrc/makefile.com
+++ b/contrib/romafot/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.ROMAFOT.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:50 UTC 2015
+$ ! .DATE Thu May 21 14:15:33 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/romafot/src/makefile.com b/contrib/romafot/src/makefile.com
index 74aad29..18c359a 100644
--- a/contrib/romafot/src/makefile.com
+++ b/contrib/romafot/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.ROMAFOT.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:49 UTC 2015
+$ ! .DATE Thu May 21 14:15:33 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/surfphot/libsrc/makefile.com b/contrib/surfphot/libsrc/makefile.com
index 7b41cc6..c81edc1 100644
--- a/contrib/surfphot/libsrc/makefile.com
+++ b/contrib/surfphot/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.SURFPHOT.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:51 UTC 2015
+$ ! .DATE Thu May 21 14:15:34 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/surfphot/src/makefile.com b/contrib/surfphot/src/makefile.com
index 127e0f8..e0284c6 100644
--- a/contrib/surfphot/src/makefile.com
+++ b/contrib/surfphot/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.SURFPHOT.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:51 UTC 2015
+$ ! .DATE Thu May 21 14:15:34 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/template/libsrc/makefile.com b/contrib/template/libsrc/makefile.com
index 4432855..9833cda 100644
--- a/contrib/template/libsrc/makefile.com
+++ b/contrib/template/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.TEMPLATE.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:51 UTC 2015
+$ ! .DATE Thu May 21 14:15:34 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/template/src/makefile.com b/contrib/template/src/makefile.com
index 22865dd..77880ff 100644
--- a/contrib/template/src/makefile.com
+++ b/contrib/template/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.TEMPLATE.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:51 UTC 2015
+$ ! .DATE Thu May 21 14:15:34 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/tsa/libsrc/makefile.com b/contrib/tsa/libsrc/makefile.com
index e075e59..2d3b2f0 100644
--- a/contrib/tsa/libsrc/makefile.com
+++ b/contrib/tsa/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.TSA.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:47 UTC 2015
+$ ! .DATE Thu May 21 14:15:30 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/tsa/src/makefile.com b/contrib/tsa/src/makefile.com
index c1b2d48..8b6b3b0 100644
--- a/contrib/tsa/src/makefile.com
+++ b/contrib/tsa/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.TSA.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:47 UTC 2015
+$ ! .DATE Thu May 21 14:15:30 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/wavelet/libsrc/makefile.com b/contrib/wavelet/libsrc/makefile.com
index 53e47bd..f5899e1 100644
--- a/contrib/wavelet/libsrc/makefile.com
+++ b/contrib/wavelet/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.WAVELET.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:50 UTC 2015
+$ ! .DATE Thu May 21 14:15:33 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/contrib/wavelet/src/makefile.com b/contrib/wavelet/src/makefile.com
index 67fca06..4a0010d 100644
--- a/contrib/wavelet/src/makefile.com
+++ b/contrib/wavelet/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.CONTRIB.WAVELET.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:50 UTC 2015
+$ ! .DATE Thu May 21 14:15:33 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/gui/GraphLib/libsrc/Comm/makefile.com b/gui/GraphLib/libsrc/Comm/makefile.com
index e840f6e..73e7c0c 100644
--- a/gui/GraphLib/libsrc/Comm/makefile.com
+++ b/gui/GraphLib/libsrc/Comm/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.GUI.GRAPHLIB.LIBSRC.COMM]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:42 UTC 2015
+$ ! .DATE Thu May 21 14:15:25 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/gui/GraphLib/libsrc/uimxR5/src/filepath.c b/gui/GraphLib/libsrc/uimxR5/src/filepath.c
index abdb494..3f7f928 100644
--- a/gui/GraphLib/libsrc/uimxR5/src/filepath.c
+++ b/gui/GraphLib/libsrc/uimxR5/src/filepath.c
@@ -438,7 +438,7 @@ static dstring expand_macros(ds)
endc= *end;
*end= '\0';
- if(*pntr != '\0');
+ if(*pntr != '\0')
dappend(rtrn, getenv(pntr));
*end= endc;
diff --git a/gui/GraphLib/libsrc/uimxR5/src/makefile.com b/gui/GraphLib/libsrc/uimxR5/src/makefile.com
index 74d6657..92f5912 100644
--- a/gui/GraphLib/libsrc/uimxR5/src/makefile.com
+++ b/gui/GraphLib/libsrc/uimxR5/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.GUI.GRAPHLIB.LIBSRC.UIMXR5.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:42 UTC 2015
+$ ! .DATE Thu May 21 14:15:25 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/gui/GraphLib/libsrc/uimxR5/src/sp_utils.c b/gui/GraphLib/libsrc/uimxR5/src/sp_utils.c
index 5697337..b895b50 100644
--- a/gui/GraphLib/libsrc/uimxR5/src/sp_utils.c
+++ b/gui/GraphLib/libsrc/uimxR5/src/sp_utils.c
@@ -22,6 +22,7 @@
/*--- include files ---*/
#include <unistd.h>
+#include <string.h>
#include "uxproto.h"
#include "version.h"
@@ -190,15 +191,7 @@ char *msg2;
{
int error;
-#if defined(__Darwin__)
extern int errno;
-#else
-extern int errno, sys_nerr;
-#endif
-
-#if !defined(__linux__) && !defined(__Darwin__) && !defined(Cygwin)
-extern char *sys_errlist[];
-#endif
char buffer[BUFSIZ];
@@ -213,12 +206,8 @@ char buffer[BUFSIZ];
(void) strcat(buffer, ": ");
}
}
- if(error > 0 && error < sys_nerr) {
- (void) strcat(buffer, sys_errlist[errno]);
- (void) strcat(buffer, "\n");
- } else {
- (void) strcat(buffer, CGETS( MS_MISC_SYS_ERR, DS_MS_MISC_SYS_ERR));
- }
+ (void) strcat(buffer, strerror(errno));
+ (void) strcat(buffer, "\n");
UxStandardError(buffer);
}
diff --git a/gui/XDo/src/applic.c b/gui/XDo/src/applic.c
index 74429fa..15349b5 100644
--- a/gui/XDo/src/applic.c
+++ b/gui/XDo/src/applic.c
@@ -307,7 +307,7 @@ extern Widget rowrule[256][2];
extern swidget myerror;
extern int tidost;
int i,col,len,fin,colnew,ncol,dummy,index;
-char label[TBL_LABLEN+1],op[2],crit[256];
+char label[TBL_LABLEN+1],op[3],crit[256];
char mymess[60];
index = strscans(descr,":#");
if (!descr[index]) {
@@ -670,7 +670,7 @@ int initmytable()
{
extern int tidcomm;
int col,pid,val;
-char cval[1];
+char cval[2];
TCTINI("TAB_COMM",F_TRANS,F_O_MODE,3,1,&tidcomm);
TCCINI(tidcomm,D_I4_FORMAT,1,"I6"," ","PID",&col);
TCCINI(tidcomm,D_C_FORMAT,60,"A20"," ","OST",&col);
diff --git a/incl/mutil.h b/incl/mutil.h
index 5c0be35..b5d4788 100644
--- a/incl/mutil.h
+++ b/incl/mutil.h
@@ -68,7 +68,7 @@ extern float pik_median
extern void heap_copy
(
#ifdef __STDC__
- int, float [];
+ int, float [], float[]
#endif
);
@@ -138,20 +138,6 @@ extern void heapFillRank(
void fit_poly (float inimage[], float outimage[], double start,
double step, int npix, int fit_deg);
-extern void sort3
-(
-#ifdef __STDC__
- unsigned long n, float ra[], float rb[], float rc[]
-#endif
- );
-
-extern void sort2
-(
-#ifdef __STDC__
- unsigned long n, float arr[], float brr[]
-#endif
- );
-
extern void fit_poly_weight
(
#ifdef __STDC__
diff --git a/incl/proto_os.h b/incl/proto_os.h
index c77ebb5..551ba4c 100644
--- a/incl/proto_os.h
+++ b/incl/proto_os.h
@@ -18,6 +18,7 @@
/* to avoid generic complains for strlen() */
#include <string.h>
+#include <sys/types.h>
#ifdef __cplusplus
extern "C" {
diff --git a/lib/makefile b/lib/makefile
index cd5384e..2715d14 100644
--- a/lib/makefile
+++ b/lib/makefile
@@ -82,7 +82,7 @@ $(LIBGMIDAS): $(LIBS1)
$(AR) $(AR_OPT) $(LIBGMIDAS) *.o
rm -f __*
$(RANLIB) $(LIBGMIDAS)
- $(SH_CMD) -o $(LIBGMIDAS_SH) *.o -L -lmidas $(DEV_NULL)
+ $(SH_CMD) -o $(LIBGMIDAS_SH) *.o -L$(LIBDIR) $(SLIB) -lmidas $(DEV_NULL)
rm -f *.o
clean:
diff --git a/libsrc/agl/makefile.com b/libsrc/agl/makefile.com
index eb44083..1251b31 100644
--- a/libsrc/agl/makefile.com
+++ b/libsrc/agl/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.AGL]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:57 UTC 2015
+$ ! .DATE Thu May 21 14:15:40 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/astro/makefile.com b/libsrc/astro/makefile.com
index bcf7673..3d73318 100644
--- a/libsrc/astro/makefile.com
+++ b/libsrc/astro/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.ASTRO]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:59 UTC 2015
+$ ! .DATE Thu May 21 14:15:42 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/display/makefile.com b/libsrc/display/makefile.com
index da1f774..46fd108 100644
--- a/libsrc/display/makefile.com
+++ b/libsrc/display/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.DISPLAY]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:57 UTC 2015
+$ ! .DATE Thu May 21 14:15:40 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/ftoc-new/sti.fc b/libsrc/ftoc-new/sti.fc
index 0159003..05ae753 100644
--- a/libsrc/ftoc-new/sti.fc
+++ b/libsrc/ftoc-new/sti.fc
@@ -101,10 +101,10 @@ else
*pntr = -diff;
n = (int) strlen(ptr2);
-if ((n > 0) && (n < m1)) *(ptr2+n) = ' ';
+if ((n > 0) && (n < m1-1)) *(ptr2+n) = ' ';
n = (int) strlen(ptr3);
-if ((n > 0) && (n < m2)) *(ptr3+n) = ' ';
+if ((n > 0) && (n < m2-1)) *(ptr3+n) = ' ';
return 0;
}
diff --git a/libsrc/ftoc-new/ystk.for b/libsrc/ftoc-new/ystk.for
index 664b0ed..04eeeab 100644
--- a/libsrc/ftoc-new/ystk.for
+++ b/libsrc/ftoc-new/ystk.for
@@ -224,7 +224,7 @@ C
CALL STSTR(1,KEY) !STRIPPED_STRING
CALL STLOC(1,0,VALUES) !untouched CHAR_LOC
C
- CALL STK9(NOELM,FELEM,MAXVALS,ACTVALS,STATUS)
+ CALL STK9(NOELM,FELEM,MAXVALS,STATUS)
C
RETURN
diff --git a/libsrc/ftoc-old/makefile.com b/libsrc/ftoc-old/makefile.com
index a42d4ab..938a784 100644
--- a/libsrc/ftoc-old/makefile.com
+++ b/libsrc/ftoc-old/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.FTOC-OLD]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:59 UTC 2015
+$ ! .DATE Thu May 21 14:15:42 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/idi/cidi/makefile.com b/libsrc/idi/cidi/makefile.com
index 7ad922a..1788b71 100644
--- a/libsrc/idi/cidi/makefile.com
+++ b/libsrc/idi/cidi/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.IDI.CIDI]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:57 UTC 2015
+$ ! .DATE Thu May 21 14:15:41 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/idi/cidi/x11/makefile.com b/libsrc/idi/cidi/x11/makefile.com
index 10974f6..b789ac1 100644
--- a/libsrc/idi/cidi/x11/makefile.com
+++ b/libsrc/idi/cidi/x11/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.IDI.CIDI.X11]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:57 UTC 2015
+$ ! .DATE Thu May 21 14:15:40 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/idi/fidi/deanza/makefile.com b/libsrc/idi/fidi/deanza/makefile.com
index fe860e8..a74ad53 100644
--- a/libsrc/idi/fidi/deanza/makefile.com
+++ b/libsrc/idi/fidi/deanza/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.IDI.FIDI.DEANZA]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:58 UTC 2015
+$ ! .DATE Thu May 21 14:15:41 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/idi/fidi/makefile.com b/libsrc/idi/fidi/makefile.com
index 0e56e29..5572d2b 100644
--- a/libsrc/idi/fidi/makefile.com
+++ b/libsrc/idi/fidi/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.IDI.FIDI]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:58 UTC 2015
+$ ! .DATE Thu May 21 14:15:41 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/idi/fidi/newdev/makefile.com b/libsrc/idi/fidi/newdev/makefile.com
index 4a96612..ac8e2e6 100644
--- a/libsrc/idi/fidi/newdev/makefile.com
+++ b/libsrc/idi/fidi/newdev/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.IDI.FIDI.NEWDEV]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:58 UTC 2015
+$ ! .DATE Thu May 21 14:15:41 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/idi/fidi/nodeanza/makefile.com b/libsrc/idi/fidi/nodeanza/makefile.com
index 74fe29e..7816b24 100644
--- a/libsrc/idi/fidi/nodeanza/makefile.com
+++ b/libsrc/idi/fidi/nodeanza/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.IDI.FIDI.NODEANZA]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:57 UTC 2015
+$ ! .DATE Thu May 21 14:15:41 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/idi/fnidi/makefile.com b/libsrc/idi/fnidi/makefile.com
index 6f24424..dddd361 100644
--- a/libsrc/idi/fnidi/makefile.com
+++ b/libsrc/idi/fnidi/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.IDI.FNIDI]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:57 UTC 2015
+$ ! .DATE Thu May 21 14:15:41 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/math/heapsort.c b/libsrc/math/heapsort.c
index bf076b0..b8c7607 100644
--- a/libsrc/math/heapsort.c
+++ b/libsrc/math/heapsort.c
@@ -1,5 +1,5 @@
/*===========================================================================
- Copyright (C) 1995 European Southern Observatory (ESO)
+ Copyright (C) 1995-2015 European Southern Observatory (ESO)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -25,20 +25,19 @@
GERMANY
===========================================================================*/
+#include "mutil.h"
+
#include <stdio.h>
#include <time.h>
+#include <string.h>
+#include <stdlib.h>
-#include "mutil.h"
-
-void siftDownInt(int numbers[], int rank[], int root, int bottom);
-void siftDownFloat(float numbers[], int rank[], int root, int bottom);
-void siftDownDouble(double numbers[], int rank[], int root, int bottom);
long int GetTickCount();
double GetDuration(long int t1, long int t2);
/* Validation code */
-/*
+#ifdef VALIDATE_CODE
#define NUM_ITEMS 10
float flt_numbers[NUM_ITEMS];
@@ -90,166 +89,64 @@ int main(void)
printf("[%d]=%f ", rank[i],flt_numbers[i]);
printf("\n");
- return 0;
-
-}
-*/
-
-void heapSortInt(int array_size, int numbers[], int rank[])
-{
- int i;
- int temp; // Change to support type
- int tmp_rank;
-
- for (i = (array_size / 2)-1; i >= 0; i--)
- siftDownInt(numbers, rank, i, array_size);
-
- for (i = array_size-1; i >= 1; i--)
- {
- temp = numbers[0];
- tmp_rank = rank[0];
- numbers[0] = numbers[i];
- rank[0] = rank[i];
- numbers[i] = temp;
- rank[i] = tmp_rank;
- siftDownInt(numbers, rank, 0, i-1);
- }
-}
-
-void siftDownInt(int numbers[], int rank[], int root, int bottom)
-{
- int done, maxChild;
- int temp; // Change to support type
- int tmp_rank;
-
- done = 0;
- while ((root*2 <= bottom) && (!done))
- {
- if (root*2 == bottom)
- maxChild = root * 2;
- else if (numbers[root * 2] > numbers[root * 2 + 1])
- maxChild = root * 2;
- else
- maxChild = root * 2 + 1;
-
- if (numbers[root] < numbers[maxChild])
- {
- temp = numbers[root];
- tmp_rank = rank[root];
- numbers[root] = numbers[maxChild];
- rank[root] = rank[maxChild];
- numbers[maxChild] = temp;
- rank[maxChild] = tmp_rank;
- root = maxChild;
- }
- else
- done = 1;
- }
-}
-
-void heapSortFloat(int array_size, float numbers[], int rank[])
-{
- int i;
- float temp; // Change to support type
- int tmp_rank;
+ {
+ int n = 9;
+ int i;
+ float *flt_numbers = malloc(n * sizeof(float));
+ int *rank = malloc(n * sizeof(int));
+
+ heapFillRank(n, rank, 0);
+ flt_numbers[0]=0.002437;
+ flt_numbers[1]=0.002441;
+ flt_numbers[2]=0.002430;
+ flt_numbers[3]=0.002438;
+ flt_numbers[4]=0.002461;
+ flt_numbers[5]=0.002463;
+ flt_numbers[6]=0.002413;
+ flt_numbers[7]=0.002451;
+ flt_numbers[8]=0.002467;
+ heapSortFloat(n, flt_numbers, rank);
+ printf("i rank flt\n");
+ printf("%i: %i %f\n", 0, rank[0], flt_numbers[0]);
+ for (i = 1; i < n; i++) {
+ printf("%i: %i %f%s\n", i, rank[i], flt_numbers[i],
+ (flt_numbers[i-1] > flt_numbers[i])?" (not in order)":"");
+ if (flt_numbers[i-1] > flt_numbers[i])
+ abort();
+ }
+ free(flt_numbers);
+ free(rank);
+ }
- for (i = (array_size / 2)-1; i >= 0; i--)
- siftDownFloat(numbers, rank, i, array_size);
-
- for (i = array_size-1; i >= 1; i--)
- {
- temp = numbers[0];
- tmp_rank = rank[0];
- numbers[0] = numbers[i];
- rank[0] = rank[i];
- numbers[i] = temp;
- rank[i] = tmp_rank;
- siftDownFloat(numbers, rank, 0, i-1);
- }
-}
-
-void siftDownFloat(float numbers[], int rank[], int root, int bottom)
-{
- int done, maxChild;
- float temp; // Change to support type
- int tmp_rank;
-
- done = 0;
- while ((root*2 <= bottom) && (!done))
- {
- if (root*2 == bottom)
- maxChild = root * 2;
- else if (numbers[root * 2] > numbers[root * 2 + 1])
- maxChild = root * 2;
- else
- maxChild = root * 2 + 1;
-
- if (numbers[root] < numbers[maxChild])
- {
- temp = numbers[root];
- tmp_rank = rank[root];
- numbers[root] = numbers[maxChild];
- rank[root] = rank[maxChild];
- numbers[maxChild] = temp;
- rank[maxChild] = tmp_rank;
- root = maxChild;
- }
- else
- done = 1;
- }
-}
-
-void heapSortDouble(int array_size, double numbers[], int rank[])
-{
- int i;
- double temp; // Change to support type
- int tmp_rank;
-
- for (i = (array_size / 2)-1; i >= 0; i--)
- siftDownDouble(numbers, rank, i, array_size);
-
- for (i = array_size-1; i >= 1; i--)
- {
- temp = numbers[0];
- tmp_rank = rank[0];
- numbers[0] = numbers[i];
- rank[0] = rank[i];
- numbers[i] = temp;
- rank[i] = tmp_rank;
- siftDownDouble(numbers, rank, 0, i-1);
- }
-}
-
-void siftDownDouble(double numbers[], int rank[], int root, int bottom)
-{
- int done, maxChild;
- double temp; // Change to support type
- int tmp_rank;
-
- done = 0;
- while ((root*2 <= bottom) && (!done))
- {
- if (root*2 == bottom)
- maxChild = root * 2;
- else if (numbers[root * 2] > numbers[root * 2 + 1])
- maxChild = root * 2;
- else
- maxChild = root * 2 + 1;
+ return 0;
- if (numbers[root] < numbers[maxChild])
- {
- temp = numbers[root];
- tmp_rank = rank[root];
- numbers[root] = numbers[maxChild];
- rank[root] = rank[maxChild];
- numbers[maxChild] = temp;
- rank[maxChild] = tmp_rank;
- root = maxChild;
- }
- else
- done = 1;
- }
}
+#endif
+
+#define MIDAS_TOOLS_SORT_LT(a, b) ((a) < (b))
+#define MIDAS_INT_SWAP(a,b) { const int t=(a); (a)=(b); (b)=t; }
+
+#define CONCAT(a,b) a ## b
+#define CONCAT2X(a,b) CONCAT(a,b)
+#define ADDTYPE(a) CONCAT2X(a, MIDAS_TYPE_NAME)
+
+#define MIDAS_TYPE_NAME Int
+#define MIDAS_TYPE int
+#include "heapsort.h"
+#undef MIDAS_TYPE_NAME
+#undef MIDAS_TYPE
+
+#define MIDAS_TYPE_NAME Float
+#define MIDAS_TYPE float
+#include "heapsort.h"
+#undef MIDAS_TYPE_NAME
+#undef MIDAS_TYPE
+
+#define MIDAS_TYPE_NAME Double
+#define MIDAS_TYPE double
+#include "heapsort.h"
+#undef MIDAS_TYPE_NAME
+#undef MIDAS_TYPE
void heapFillRank(int array_size, int rank[], int offset)
{
diff --git a/libsrc/math/heapsort.h b/libsrc/math/heapsort.h
new file mode 100644
index 0000000..bcb6f5a
--- /dev/null
+++ b/libsrc/math/heapsort.h
@@ -0,0 +1,108 @@
+/* code from cpl 6.6
+ * changes: renames and sorts the input using the pattern */
+void ADDTYPE(heapSort)(int n, MIDAS_TYPE self[], int sort_pattern[])
+{
+ int i;
+ int reverse = 0;
+
+ if (n == 0) return;
+
+ /* by zero indexing, but contents are by one, added later */
+ for (i = 0; i < n; i++) {
+ sort_pattern[i] = i;
+ }
+
+ /*
+ * Heap sort
+ */
+ for (i = n / 2 - 1; i >= 0; i--) {
+ int done = 0;
+ int root = i;
+ int bottom = n - 1;
+
+ while ((root*2 + 1 <= bottom) && (!done)) {
+ int child = root*2 + 1;
+
+ if (child+1 <= bottom) {
+ if ((!reverse && MIDAS_TOOLS_SORT_LT(
+ self[sort_pattern[child]],
+ self[sort_pattern[child + 1]]))
+ ||
+ (reverse && MIDAS_TOOLS_SORT_LT(
+ self[sort_pattern[child + 1]],
+ self[sort_pattern[child]]))
+ ) {
+ child += 1;
+ }
+ }
+
+ if ((!reverse && MIDAS_TOOLS_SORT_LT(
+ self[sort_pattern[root]],
+ self[sort_pattern[child]]))
+ ||
+ (reverse && MIDAS_TOOLS_SORT_LT(
+ self[sort_pattern[child]],
+ self[sort_pattern[root]]))
+ ) {
+ MIDAS_INT_SWAP(sort_pattern[root], sort_pattern[child]);
+ root = child;
+ }
+ else {
+ done = 1;
+ }
+ }
+ }
+
+ for (i = n - 1; i >= 1; i--) {
+ int done = 0;
+ int root = 0;
+ int bottom = i - 1;
+ MIDAS_INT_SWAP(sort_pattern[0], sort_pattern[i]);
+
+ while ((root*2 + 1 <= bottom) && (!done)) {
+ int child = root*2 + 1;
+
+ if (child+1 <= bottom) {
+ if ((!reverse && MIDAS_TOOLS_SORT_LT(
+ self[sort_pattern[child]],
+ self[sort_pattern[child + 1]]))
+ ||
+ (reverse && MIDAS_TOOLS_SORT_LT(
+ self[sort_pattern[child + 1]],
+ self[sort_pattern[child]]))
+ ) {
+ child += 1;
+ }
+ }
+ if ((!reverse && MIDAS_TOOLS_SORT_LT(
+ self[sort_pattern[root]],
+ self[sort_pattern[child]]))
+ ||
+ (reverse && MIDAS_TOOLS_SORT_LT(
+ self[sort_pattern[child]],
+ self[sort_pattern[root]]))
+ ) {
+ MIDAS_INT_SWAP(sort_pattern[root], sort_pattern[child]);
+ root = child;
+ }
+ else {
+ done = 1;
+ }
+ }
+ }
+
+ /* sort data array */
+ MIDAS_TYPE * nself = malloc(sizeof(*nself) * n);
+ memcpy(nself, self, sizeof(*nself) * n);
+ for (i = 0; i < n; i++) {
+ self[i] = nself[sort_pattern[i]];
+ }
+ free(nself);
+
+ /* change pattern content to by one indexing */
+ for (i = 0; i < n; i++) {
+ sort_pattern[i] += 1;
+ }
+
+ return;
+}
diff --git a/libsrc/math/makefile.com b/libsrc/math/makefile.com
index 7e1aae1..2f0079b 100644
--- a/libsrc/math/makefile.com
+++ b/libsrc/math/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.MATH]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:59 UTC 2015
+$ ! .DATE Thu May 21 14:15:42 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/math/mutil.c b/libsrc/math/mutil.c
index 86d9868..fea5a14 100644
--- a/libsrc/math/mutil.c
+++ b/libsrc/math/mutil.c
@@ -266,7 +266,6 @@ void heap_copy (n, arr, out)
{
int j;
float diff;
- printf("Copying array of size %d\n",n);
for (j=0; j<n; j++) out[j] = arr[j];
diff --git a/libsrc/nag/makefile.com b/libsrc/nag/makefile.com
index 33343d4..698278e 100644
--- a/libsrc/nag/makefile.com
+++ b/libsrc/nag/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.NAG]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:58 UTC 2015
+$ ! .DATE Thu May 21 14:15:42 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/os/vms/makefile.com b/libsrc/os/vms/makefile.com
index 719a147..c09fe0e 100644
--- a/libsrc/os/vms/makefile.com
+++ b/libsrc/os/vms/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.OS.VMS]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:56 UTC 2015
+$ ! .DATE Thu May 21 14:15:40 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/plot/makefile.com b/libsrc/plot/makefile.com
index 68e21f8..f8be32a 100644
--- a/libsrc/plot/makefile.com
+++ b/libsrc/plot/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.PLOT]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:59 UTC 2015
+$ ! .DATE Thu May 21 14:15:43 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/st/makefile.com b/libsrc/st/makefile.com
index 8eacb19..d02eca7 100644
--- a/libsrc/st/makefile.com
+++ b/libsrc/st/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.ST]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:58 UTC 2015
+$ ! .DATE Thu May 21 14:15:42 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/st/midfct.c b/libsrc/st/midfct.c
index 82526d3..2f8921b 100644
--- a/libsrc/st/midfct.c
+++ b/libsrc/st/midfct.c
@@ -148,8 +148,7 @@ if (mm > -1)
{ /* we have a FITS file with a dir. */
char curdir[1024];
- (void) getcwd(curdir,(size_t)1024);
- if (curdir[0] != '\0')
+ if (getcwd(curdir,(size_t)1024) != NULL)
{
char *dirc, *dirnam;
diff --git a/libsrc/st/scc.c b/libsrc/st/scc.c
index 634a32e..20e0e18 100644
--- a/libsrc/st/scc.c
+++ b/libsrc/st/scc.c
@@ -242,9 +242,9 @@ int stat, mycno;
stat = MID_CCRE(catfile,type,catdsc,&mycno);
if (stat != ERR_NORMAL)
{
- if (stat = ERR_INPINV)
+ if (stat == ERR_INPINV)
SCTPUT("(ERR) SCCCRE: - INPINV");
- else if (stat = ERR_CATBAD)
+ else if (stat == ERR_CATBAD)
SCTPUT("(ERR) SCCCRE: - CATBAD");
else
SCTPUT("(ERR) SCCCRE: - CATOVF");
diff --git a/libsrc/st/scdx.c b/libsrc/st/scdx.c
index b244070..87478a4 100644
--- a/libsrc/st/scdx.c
+++ b/libsrc/st/scdx.c
@@ -157,7 +157,7 @@ if (htext != (char *) 0)
{
if (htext[0] != '\0')
{
- (void) memcpy(help,htext,(size_t)71);
+ (void) strncpy(help,htext,(size_t)71);
help[71] = '\0';
}
}
@@ -260,7 +260,7 @@ if (htext != (char *) 0)
{
if (htext[0] != '\0')
{
- (void) memcpy(help,htext,(size_t)71);
+ (void) strncpy(help,htext,(size_t)71);
help[71] = '\0';
}
}
@@ -332,7 +332,7 @@ if (htext != (char *) 0)
{
if (htext[0] != '\0')
{
- (void) memcpy(help,htext,(size_t)71);
+ (void) strncpy(help,htext,(size_t)71);
help[71] = '\0';
}
}
@@ -404,7 +404,7 @@ if (htext != (char *) 0)
{
if (htext[0] != '\0')
{
- (void) memcpy(help,htext,(size_t)71);
+ (void) strncpy(help,htext,(size_t)71);
help[71] = '\0';
}
}
@@ -471,7 +471,7 @@ if (htext != (char *) 0)
{
if (htext[0] != '\0')
{
- (void) memcpy(help,htext,(size_t)71);
+ (void) strncpy(help,htext,(size_t)71);
help[71] = '\0';
}
}
@@ -538,7 +538,7 @@ if (htext != (char *) 0)
{
if (htext[0] != '\0')
{
- (void) memcpy(help,htext,(size_t)71);
+ (void) strncpy(help,htext,(size_t)71);
help[71] = '\0';
}
}
diff --git a/libsrc/st/scfa.c b/libsrc/st/scfa.c
index 681175c..da965de 100644
--- a/libsrc/st/scfa.c
+++ b/libsrc/st/scfa.c
@@ -438,9 +438,14 @@ for (i=0; i<FCT.MAXENT; i++)
{
if (fctpntr->FILTYP > 0) /* for FITS files */
{
- (void) strcpy(origname,fctpntr->NAME+4);
- i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
- origname[i] = '\0';
+ if (fctpntr->O_NAMLEN == 0)
+ (void) strcpy(origname,fctpntr->NAME);
+ else /* internal FITS file */
+ {
+ (void) strcpy(origname,fctpntr->NAME+4);
+ i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
+ origname[i] = '\0';
+ }
ptr = origname;
}
else
diff --git a/libsrc/st/scfb.c b/libsrc/st/scfb.c
index bc89029..6942fe3 100644
--- a/libsrc/st/scfb.c
+++ b/libsrc/st/scfb.c
@@ -292,9 +292,14 @@ if (fctpntr->FILTYP > 1)
char *datpntr, origname[FCT_NAME_LEN];
datpntr = fctpntr->BDADDR[0];
- (void) strcpy(origname,fctpntr->NAME+4);
- mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
- origname[mm] = '\0';
+ if (fctpntr->O_NAMLEN == 0)
+ (void) strcpy(origname,fctpntr->NAME);
+ else /* internal FITS file */
+ {
+ (void) strcpy(origname,fctpntr->NAME+4);
+ mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
+ origname[mm] = '\0';
+ }
status = MID_fitsin(2,origname,-1,"",datpntr,imno,&i);
status = TCTFIX(*imno); /* write table control descriptors */
fctpntr->ACCESS = 'I'; /* reset */
@@ -456,9 +461,14 @@ fitsupdate = 0; /* default to update=NO */
if (fctpntr->FILTYP > 0)
{
- (void) strcpy(origname,fctpntr->NAME+4);
- i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
- origname[i] = '\0';
+ if (fctpntr->O_NAMLEN == 0)
+ (void) strcpy(origname,fctpntr->NAME);
+ else /* internal FITS file */
+ {
+ (void) strcpy(origname,fctpntr->NAME+4);
+ i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
+ origname[i] = '\0';
+ }
nampntr = origname;
}
else
@@ -850,9 +860,14 @@ else
char origname[FCT_NAME_LEN];
dum[0] = '\0';
- (void) strcpy(origname,fctpntr->NAME+4);
- mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
- origname[mm] = '\0';
+ if (fctpntr->O_NAMLEN == 0)
+ (void) strcpy(origname,fctpntr->NAME);
+ else /* internal FITS file */
+ {
+ (void) strcpy(origname,fctpntr->NAME+4);
+ mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
+ origname[mm] = '\0';
+ }
mm = imno; /* get data as real */
status = MID_fitsin(2,origname,-1,dum,mypntr,&mm,&i);
/*
diff --git a/libsrc/tbl/makefile.com b/libsrc/tbl/makefile.com
index 5299e45..174da9b 100644
--- a/libsrc/tbl/makefile.com
+++ b/libsrc/tbl/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.TBL]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:57 UTC 2015
+$ ! .DATE Thu May 21 14:15:40 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/tw/makefile.com b/libsrc/tw/makefile.com
index 75fa354..d068fea 100644
--- a/libsrc/tw/makefile.com
+++ b/libsrc/tw/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.TW]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:59 UTC 2015
+$ ! .DATE Thu May 21 14:15:42 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/libsrc/xcon/makefile.com b/libsrc/xcon/makefile.com
index 0d712c7..f83254e 100644
--- a/libsrc/xcon/makefile.com
+++ b/libsrc/xcon/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.LIBSRC.XCON]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:59 UTC 2015
+$ ! .DATE Thu May 21 14:15:42 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/monit/makefile.com b/monit/makefile.com
index 3029c36..9052139 100644
--- a/monit/makefile.com
+++ b/monit/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.MONIT]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:45 UTC 2015
+$ ! .DATE Thu May 21 14:15:28 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/monit/syskeys.datorg b/monit/syskeys.datorg
index a842111..6f19759 100644
--- a/monit/syskeys.datorg
+++ b/monit/syskeys.datorg
@@ -312,7 +312,7 @@ C (28:29) PY if executed from PyMidas
C (30:30) spare
C SECT./END_OF_KEY
MID$SESS/C/30/R
-NULL -- XX 15FEBpl1.1 xxx
+NULL -- XX 15FEBpl1.2 xxx
C NULL -- XX 11SEPpl1.2 xxx
C
C SECT./APPLIC no. 24
diff --git a/prim/dio/libsrc/fitsrhd.c b/prim/dio/libsrc/fitsrhd.c
index a3708ed..ca4d845 100644
--- a/prim/dio/libsrc/fitsrhd.c
+++ b/prim/dio/libsrc/fitsrhd.c
@@ -532,8 +532,8 @@ dtype,bfdef->bzero,bfdef->bscale);
*/
else if ( (dtype == D_I2_FORMAT) &&
- (abs(bfdef->bzero-32768.0) < eps) &&
- (abs(bfdef->bscale-1.0) < eps) )
+ (fabs(bfdef->bzero-32768.0) < eps) &&
+ (fabs(bfdef->bscale-1.0) < eps) )
{
xtype = D_UI2_FORMAT;
bfdef->bitpix = -16;
diff --git a/prim/dio/libsrc/makefile.com b/prim/dio/libsrc/makefile.com
index a8c3853..5f68f2b 100644
--- a/prim/dio/libsrc/makefile.com
+++ b/prim/dio/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.DIO.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:53 UTC 2015
+$ ! .DATE Thu May 21 14:15:36 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/dio/src/makefile.com b/prim/dio/src/makefile.com
index 62e5fdb..655c25c 100644
--- a/prim/dio/src/makefile.com
+++ b/prim/dio/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.DIO.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:53 UTC 2015
+$ ! .DATE Thu May 21 14:15:36 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/display/libsrc/makefile.com b/prim/display/libsrc/makefile.com
index a5336fe..2fc351b 100644
--- a/prim/display/libsrc/makefile.com
+++ b/prim/display/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.DISPLAY.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:51 UTC 2015
+$ ! .DATE Thu May 21 14:15:35 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/display/src/makefile.com b/prim/display/src/makefile.com
index a6e944d..7ffffb5 100644
--- a/prim/display/src/makefile.com
+++ b/prim/display/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.DISPLAY.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:51 UTC 2015
+$ ! .DATE Thu May 21 14:15:35 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/display/src/statis.for b/prim/display/src/statis.for
index 5b0cec4..c758f04 100644
--- a/prim/display/src/statis.for
+++ b/prim/display/src/statis.for
@@ -216,7 +216,7 @@ C
+ CALL STETER(31,'bad table column no....')
ENDIF
C !store tmp name in OUT_B
- CALL STKWRC('OUT_B',1,'tcol2ima.bdf ',1,20,UNI,STAT)
+ CALL STKWRC('OUT_B',1,'tcol2ima.bdf ',1,15,UNI,STAT)
CALL TCOLIM(ORFILE,OUTPUT(1:16),ICOLNM(1),STAT)
IF (STAT.NE.0) CALL STETER(32,
+ 'problems creating temp. image from table column...')
diff --git a/prim/edit/libsrc/makefile.com b/prim/edit/libsrc/makefile.com
index 4b75adc..a88bd4c 100644
--- a/prim/edit/libsrc/makefile.com
+++ b/prim/edit/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.EDIT.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:52 UTC 2015
+$ ! .DATE Thu May 21 14:15:35 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/general/libsrc/cextrco.c b/prim/general/libsrc/cextrco.c
index df9aecf..115cb19 100644
--- a/prim/general/libsrc/cextrco.c
+++ b/prim/general/libsrc/cextrco.c
@@ -590,7 +590,10 @@ if (twocoord == 0)
if (bracket > 0)
{
k = CGN_INDEXC(subst,']');
- subst[k] = '\0';
+ if (k >= 0)
+ {
+ subst[k] = '\0';
+ }
}
else
{
diff --git a/prim/general/libsrc/makefile.com b/prim/general/libsrc/makefile.com
index 34fac82..2891219 100644
--- a/prim/general/libsrc/makefile.com
+++ b/prim/general/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.GENERAL.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:53 UTC 2015
+$ ! .DATE Thu May 21 14:15:36 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/general/libsrc/md5.c b/prim/general/libsrc/md5.c
index 4cd571c..6bd52a9 100644
--- a/prim/general/libsrc/md5.c
+++ b/prim/general/libsrc/md5.c
@@ -325,7 +325,7 @@ struct MD5Context *ctx;
MD5Transform(ctx->buf, (word32 *) ctx->in);
byteReverse((unsigned char *) ctx->buf, 4);
memmove(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}
/* The four core functions - F1 is optimized somewhat */
diff --git a/prim/general/src/makefile.com b/prim/general/src/makefile.com
index 7f02072..f03a295 100644
--- a/prim/general/src/makefile.com
+++ b/prim/general/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.GENERAL.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:53 UTC 2015
+$ ! .DATE Thu May 21 14:15:36 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/plot/libsrc/makefile.com b/prim/plot/libsrc/makefile.com
index 92426af..7397e7d 100644
--- a/prim/plot/libsrc/makefile.com
+++ b/prim/plot/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.PLOT.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:53 UTC 2015
+$ ! .DATE Thu May 21 14:15:37 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/plot/src/makefile.com b/prim/plot/src/makefile.com
index 7a623bc..91715cc 100644
--- a/prim/plot/src/makefile.com
+++ b/prim/plot/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.PLOT.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:53 UTC 2015
+$ ! .DATE Thu May 21 14:15:37 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/plot/src/modgcur.c b/prim/plot/src/modgcur.c
index 914afee..4a9f71f 100644
--- a/prim/plot/src/modgcur.c
+++ b/prim/plot/src/modgcur.c
@@ -83,7 +83,7 @@ float *xdata, *ydata, area[4], image[4], wcfram[8];
double start[DIMMAX], step[DIMMAX];
-char bin[5], name[62], ident[74], cunit[66], input[73], buff[81], *label[4];
+char bin[5], name[62], ident[75], cunit[66], input[73], buff[81], *label[4];
char *cpntr, *pntr;
/*
diff --git a/prim/table/libsrc/makefile.com b/prim/table/libsrc/makefile.com
index 7f6ea56..9fa0d49 100644
--- a/prim/table/libsrc/makefile.com
+++ b/prim/table/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.TABLE.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:52 UTC 2015
+$ ! .DATE Thu May 21 14:15:35 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/table/libsrc/tbmerge.c b/prim/table/libsrc/tbmerge.c
index 8da9857..12e8fa0 100644
--- a/prim/table/libsrc/tbmerge.c
+++ b/prim/table/libsrc/tbmerge.c
@@ -261,7 +261,7 @@ int tbl_merge()
while (len>80)
{
ii = 0;
- while (linesel[ii])
+ while (linesel[ii+80])
{
linesel[ii] = linesel[ii+80];
ii++;
diff --git a/prim/table/src/makefile.com b/prim/table/src/makefile.com
index edb3c9b..ec9c8f6 100644
--- a/prim/table/src/makefile.com
+++ b/prim/table/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.TABLE.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:52 UTC 2015
+$ ! .DATE Thu May 21 14:15:35 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/tc3/libsrc/makefile.com b/prim/tc3/libsrc/makefile.com
index fea70e4..bae52ed 100644
--- a/prim/tc3/libsrc/makefile.com
+++ b/prim/tc3/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.TC3.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:52 UTC 2015
+$ ! .DATE Thu May 21 14:15:36 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/tw3/libsrc/makefile.com b/prim/tw3/libsrc/makefile.com
index 21e0646..281c692 100644
--- a/prim/tw3/libsrc/makefile.com
+++ b/prim/tw3/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.PRIM.TW3.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:53 UTC 2015
+$ ! .DATE Thu May 21 14:15:36 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/prim/tw3/libsrc/thelp.c b/prim/tw3/libsrc/thelp.c
index fc14c73..19f9f33 100644
--- a/prim/tw3/libsrc/thelp.c
+++ b/prim/tw3/libsrc/thelp.c
@@ -1432,7 +1432,7 @@ int th_merge(help, filename)
if_not((load_file(filename))) FINISH;
- if ((p = MergeHelp((PIECE *)(b->buf)), &loaded_file)) {
+ if ((p = MergeHelp((PIECE *)(b->buf), &loaded_file))) {
help->date = oshtime(); /* Be sure no Bad Index Error */
BUF_Clear(b);
BUF_AppendItem(b, PIECE, p);
diff --git a/stdred/ccdred/libsrc/makefile.com b/stdred/ccdred/libsrc/makefile.com
index 7b24b22..77eb0f7 100644
--- a/stdred/ccdred/libsrc/makefile.com
+++ b/stdred/ccdred/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.CCDRED.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:43 UTC 2015
+$ ! .DATE Thu May 21 14:15:26 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/ccdred/src/makefile.com b/stdred/ccdred/src/makefile.com
index 01b33ba..01cb5e1 100644
--- a/stdred/ccdred/src/makefile.com
+++ b/stdred/ccdred/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.CCDRED.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:43 UTC 2015
+$ ! .DATE Thu May 21 14:15:26 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/ccdtest/src/makefile.com b/stdred/ccdtest/src/makefile.com
index b09509d..0607220 100644
--- a/stdred/ccdtest/src/makefile.com
+++ b/stdred/ccdtest/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.CCDTEST.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:43 UTC 2015
+$ ! .DATE Thu May 21 14:15:26 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/do/libsrc/makefile.com b/stdred/do/libsrc/makefile.com
index 98922b3..8e7e69c 100644
--- a/stdred/do/libsrc/makefile.com
+++ b/stdred/do/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.DO.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:44 UTC 2015
+$ ! .DATE Thu May 21 14:15:28 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/do/libsrc/ostcrea.c b/stdred/do/libsrc/ostcrea.c
index c840efc..76dca46 100644
--- a/stdred/do/libsrc/ostcrea.c
+++ b/stdred/do/libsrc/ostcrea.c
@@ -94,7 +94,7 @@ unsigned long ccitt32_updcrc();
double otimetomjd();
int listtype,no,tidtemp,colfile,nenttemp,lname;
int kuni;
-char cext[4];
+char cext[5];
char finame[128],diname[128];
/*
diff --git a/stdred/do/src/makefile.com b/stdred/do/src/makefile.com
index c639cb1..895e3de 100644
--- a/stdred/do/src/makefile.com
+++ b/stdred/do/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.DO.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:44 UTC 2015
+$ ! .DATE Thu May 21 14:15:28 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/echelle/libsrc/makefile.com b/stdred/echelle/libsrc/makefile.com
index 449e28b..2d241ac 100644
--- a/stdred/echelle/libsrc/makefile.com
+++ b/stdred/echelle/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.ECHELLE.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:44 UTC 2015
+$ ! .DATE Thu May 21 14:15:27 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/echelle/src/makefile.com b/stdred/echelle/src/makefile.com
index b04b2d2..7cf6a8d 100644
--- a/stdred/echelle/src/makefile.com
+++ b/stdred/echelle/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.ECHELLE.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:44 UTC 2015
+$ ! .DATE Thu May 21 14:15:27 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/echelle/src/neciden.for b/stdred/echelle/src/neciden.for
index 2de6c81..08f1f39 100644
--- a/stdred/echelle/src/neciden.for
+++ b/stdred/echelle/src/neciden.for
@@ -108,7 +108,7 @@ C Initial coefficients (global echelle relation)
COMMON /POLY/ A,A1,IA,ABSORD
C******************************************************************************
C
- DOUBLE PRECISION AINIT(DEGMAX*DEGMAX)
+ DOUBLE PRECISION AINIT(DEGMAX*DEGMAX+1)
DOUBLE PRECISION AVRMS(2)
INTEGER LOOP1,LOOP2,IPOS,MODEG
diff --git a/stdred/feros/incl/u_const.h b/stdred/feros/incl/u_const.h
index 0d7679f..311e57f 100644
--- a/stdred/feros/incl/u_const.h
+++ b/stdred/feros/incl/u_const.h
@@ -110,7 +110,6 @@ int basis() /* BASIS maschinenunabhaengig bestimmen */
#define min(X, Y) (((X) < (Y)) ? (X) : (Y)) /* Minimum von X,Y */
#define max(X, Y) (((X) > (Y)) ? (X) : (Y)) /* Maximum von X,Y */
-#define abs(X) (((X) >= 0) ? (X) : -(X)) /* Absolutbetrag von X */
#define sign(X, Y) (((Y) < 0) ? -abs(X) : abs(X)) /* Vorzeichen von */
/* Y mal abs(X) */
#define sqr(X) ((X) * (X)) /* Quadrat von X */
diff --git a/stdred/feros/libsrc/glsp.c b/stdred/feros/libsrc/glsp.c
index 697ce6e..ed471b6 100644
--- a/stdred/feros/libsrc/glsp.c
+++ b/stdred/feros/libsrc/glsp.c
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <math.h>
/* FEROS specific includes */
@@ -630,13 +631,13 @@ return (-2); /* Ueberpruefung der Voraussetzung */
und strenge Regularitaet ueberprueft
*/
ud1[n] = ud2[n] = ud2[n - 1] = 0.0;
-def_reg = abs (md[1]) + abs (ud1[1]) + abs (ud2[1]);
+def_reg = fabs (md[1]) + fabs (ud1[1]) + fabs (ud2[1]);
if (def_reg == 0.0)
return (1);
def_reg = 1. / def_reg;
if (md[1] < 0.0)
return (-1);
-if (abs (md[1]) * def_reg <= MACH4_EPS)
+if (fabs (md[1]) * def_reg <= MACH4_EPS)
return (1);
/*
Zerlegung der Matrix bei gleichzeitiger Ueberpruefung
@@ -646,14 +647,14 @@ h_var_1 = ud1[1];
ud1[1] /= md[1];
h_var_2 = ud2[1];
ud2[1] /= md[1];
-def_reg = abs (h_var_1) + abs (md[2]) + abs (ud1[2]) + abs (ud2[2]);
+def_reg = fabs (h_var_1) + fabs (md[2]) + fabs (ud1[2]) + fabs (ud2[2]);
if (def_reg == 0.0)
return (1);
def_reg = 1. / def_reg;
md[2] -= h_var_1 * ud1[1];
if (md[2] < 0.0)
return (-1);
-if (abs (md[2]) <= MACH4_EPS)
+if (fabs (md[2]) <= MACH4_EPS)
return (1);
h_var_1 = ud1[2];
@@ -662,8 +663,8 @@ h_var_3 = ud2[2];
ud2[2] /= md[2];
for (i = 3; i <= n; ++i)
{
- def_reg = abs (h_var_2) + abs (h_var_1) + abs (md[i])
- + abs (ud1[i]) + abs (ud2[i]);
+ def_reg = fabs (h_var_2) + fabs (h_var_1) + fabs (md[i])
+ + fabs (ud1[i]) + fabs (ud2[i]);
if (def_reg == 0.0)
return (1);
def_reg = 1. / def_reg;
@@ -671,7 +672,7 @@ for (i = 3; i <= n; ++i)
md[i] -= (md[i - 1] * sqr (ud1[i - 1]) + h_var_2 * ud2[i - 2]);
if (md[i] < 0.0)
return (-1);
- if (abs (md[i] * def_reg) <= MACH4_EPS)
+ if (fabs (md[i] * def_reg) <= MACH4_EPS)
return (1);
if (i < n)
{
diff --git a/stdred/feros/libsrc/makefile.com b/stdred/feros/libsrc/makefile.com
index 33b9fdc..ec9ab6a 100644
--- a/stdred/feros/libsrc/makefile.com
+++ b/stdred/feros/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.FEROS.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:45 UTC 2015
+$ ! .DATE Thu May 21 14:15:28 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/feros/src/makefile.com b/stdred/feros/src/makefile.com
index 5f593f1..fda2cab 100644
--- a/stdred/feros/src/makefile.com
+++ b/stdred/feros/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.FEROS.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:45 UTC 2015
+$ ! .DATE Thu May 21 14:15:28 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/irac2/src/makefile.com b/stdred/irac2/src/makefile.com
index ac1eb7d..17e00b1 100644
--- a/stdred/irac2/src/makefile.com
+++ b/stdred/irac2/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.IRAC2.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:44 UTC 2015
+$ ! .DATE Thu May 21 14:15:27 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/irspec/src/makefile.com b/stdred/irspec/src/makefile.com
index 72f6d27..f21e461 100644
--- a/stdred/irspec/src/makefile.com
+++ b/stdred/irspec/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.IRSPEC.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:43 UTC 2015
+$ ! .DATE Thu May 21 14:15:26 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/long/src/makefile.com b/stdred/long/src/makefile.com
index 1bfca19..d0a31ef 100644
--- a/stdred/long/src/makefile.com
+++ b/stdred/long/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.LONG.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:44 UTC 2015
+$ ! .DATE Thu May 21 14:15:27 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/mmf/src/makefile.com b/stdred/mmf/src/makefile.com
index 81e2fb3..2e1dd74 100644
--- a/stdred/mmf/src/makefile.com
+++ b/stdred/mmf/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.MMF.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:43 UTC 2015
+$ ! .DATE Thu May 21 14:15:26 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/mos/libsrc/makefile.com b/stdred/mos/libsrc/makefile.com
index 6ccbb4f..e7a47b9 100644
--- a/stdred/mos/libsrc/makefile.com
+++ b/stdred/mos/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.MOS.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:44 UTC 2015
+$ ! .DATE Thu May 21 14:15:27 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/mos/libsrc/misc.c b/stdred/mos/libsrc/misc.c
index a6d7d83..3fbbe6f 100644
--- a/stdred/mos/libsrc/misc.c
+++ b/stdred/mos/libsrc/misc.c
@@ -13,7 +13,7 @@
.ENVIRONMENT UNIX
------------------------------------------------------------*/
-// include <proto_os.h>
+#include <proto_os.h>
#include <stdio.h>
#include <string.h>
#ifdef vms
@@ -43,7 +43,7 @@
break;
}
- if ( (int) strstrs(file, ext) == 0 )
+ if ( strstrs(file, ext) == NULL )
sprintf( fileext, "%s%s", file, ext );
else
strcpy( fileext, file );
diff --git a/stdred/mos/src/makefile.com b/stdred/mos/src/makefile.com
index 6293cc3..4ca0048 100644
--- a/stdred/mos/src/makefile.com
+++ b/stdred/mos/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.MOS.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:44 UTC 2015
+$ ! .DATE Thu May 21 14:15:27 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/optopus/libsrc/makefile.com b/stdred/optopus/libsrc/makefile.com
index 51bd04c..5ffe9da 100644
--- a/stdred/optopus/libsrc/makefile.com
+++ b/stdred/optopus/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.OPTOPUS.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:45 UTC 2015
+$ ! .DATE Thu May 21 14:15:28 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/optopus/src/makefile.com b/stdred/optopus/src/makefile.com
index 49163e0..f393055 100644
--- a/stdred/optopus/src/makefile.com
+++ b/stdred/optopus/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.OPTOPUS.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:45 UTC 2015
+$ ! .DATE Thu May 21 14:15:28 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/spec/libsrc/makefile.com b/stdred/spec/libsrc/makefile.com
index 214d4fb..306607c 100644
--- a/stdred/spec/libsrc/makefile.com
+++ b/stdred/spec/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.SPEC.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:43 UTC 2015
+$ ! .DATE Thu May 21 14:15:27 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/stdred/spec/src/makefile.com b/stdred/spec/src/makefile.com
index 2cef887..3c17531 100644
--- a/stdred/spec/src/makefile.com
+++ b/stdred/spec/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.STDRED.SPEC.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:43 UTC 2015
+$ ! .DATE Thu May 21 14:15:27 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/system/ext/putline.c b/system/ext/putline.c
index 8466c6f..c7658b8 100644
--- a/system/ext/putline.c
+++ b/system/ext/putline.c
@@ -315,7 +315,8 @@ int labno;
while ((n = CGN_INDEXS(ipntr,"MADRID")) > -1)
{
if (strncmp(ipntr,"COMMON",6) == 0) break;
- (void) CGN_UPCOPY(klaus,ipntr+n+7,20);
+ (void) CGN_UPCOPY(klaus,ipntr+n+7,21);
+ klaus[21] = '\0'; /* make sure that klaus is zero-terminated */
i = CGN_INDEXC(klaus,')');
if (i < 1)
{
diff --git a/system/ftoc-new/for_generic.for b/system/ftoc-new/for_generic.for
index 707d352..0bd5225 100644
--- a/system/ftoc-new/for_generic.for
+++ b/system/ftoc-new/for_generic.for
@@ -49,7 +49,7 @@ C
C
INTEGER NUMB, LS1, LS2, MADRID(3)
C
- CHARACTER*161 S2
+ CHARACTER*162 S2
CHARACTER*9 S1
C
REAL FF
diff --git a/system/ftoc-new/ftoc_generic.fc b/system/ftoc-new/ftoc_generic.fc
index 144b381..aeeb73e 100644
--- a/system/ftoc-new/ftoc_generic.fc
+++ b/system/ftoc-new/ftoc_generic.fc
@@ -251,7 +251,7 @@ else
n = lenloc2;
}
-*(adrptr+n) = '\0';
+*(adrptr+n-1) = '\0';
printf("C: in TTT2, string = %s|\n",adrptr);
return 0;
diff --git a/system/idiserv/libsrc/makefile.com b/system/idiserv/libsrc/makefile.com
index f97b462..909af50 100644
--- a/system/idiserv/libsrc/makefile.com
+++ b/system/idiserv/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.SYSTEM.IDISERV.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:42 UTC 2015
+$ ! .DATE Thu May 21 14:15:26 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/system/idiserv/src/makefile.com b/system/idiserv/src/makefile.com
index 2f53eb2..cb39acb 100644
--- a/system/idiserv/src/makefile.com
+++ b/system/idiserv/src/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.SYSTEM.IDISERV.SRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:42 UTC 2015
+$ ! .DATE Thu May 21 14:15:26 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/system/machine/computer.c b/system/machine/computer.c
index a48417a..ce8a8c6 100644
--- a/system/machine/computer.c
+++ b/system/machine/computer.c
@@ -63,6 +63,7 @@
#include <stdio.h>
#include <signal.h>
+#include <stdlib.h>
#ifndef NO_FLOAT_H
#include <float.h>
diff --git a/system/vms/tapeio/makefile.com b/system/vms/tapeio/makefile.com
index ac94c6a..f2bd7a8 100644
--- a/system/vms/tapeio/makefile.com
+++ b/system/vms/tapeio/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.SYSTEM.VMS.TAPEIO]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:43 UTC 2015
+$ ! .DATE Thu May 21 14:15:26 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/test/fits/makefile.com b/test/fits/makefile.com
index 61bc1e8..fd9579b 100644
--- a/test/fits/makefile.com
+++ b/test/fits/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.TEST.FITS]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:42 UTC 2015
+$ ! .DATE Thu May 21 14:15:25 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/test/prim/verify14.prg b/test/prim/verify14.prg
index cbe827e..e6ccd07 100644
--- a/test/prim/verify14.prg
+++ b/test/prim/verify14.prg
@@ -373,8 +373,8 @@ write/out "---------------------------------------------"
in_a = m$symbol("MIDASHOME") ! use keyword for safety
in_b = m$symbol("MIDVERS")
!
-write/out > create/comm select @@ {in_a}/{in_b}/test/prim/kcompare.prg
-create/comm select @@ {in_a}/{in_b}/test/prim/kcompare.prg
+write/out > create/comm select @@ kcompare.prg
+create/comm select @@ kcompare.prg
write/out > show/com select
show/com select
write/out > show/code select
diff --git a/util/bdf2ps/makefile.com b/util/bdf2ps/makefile.com
index 1c8f68d..89dc127 100644
--- a/util/bdf2ps/makefile.com
+++ b/util/bdf2ps/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.UTIL.BDF2PS]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:56 UTC 2015
+$ ! .DATE Thu May 21 14:15:39 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/util/libsrc/makefile.com b/util/libsrc/makefile.com
index 13c903f..4a1d190 100644
--- a/util/libsrc/makefile.com
+++ b/util/libsrc/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.UTIL.LIBSRC]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:56 UTC 2015
+$ ! .DATE Thu May 21 14:15:40 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
diff --git a/util/ltape/makefile.com b/util/ltape/makefile.com
index 254571d..9d99682 100644
--- a/util/ltape/makefile.com
+++ b/util/ltape/makefile.com
@@ -6,7 +6,7 @@ $ ! .AUTHOR Carlos Guirao - [ESO/IPG]
$ ! .IDENT MAKEFILE.COM
$ ! .COMMENTS Compile/link procedure in [MIDAS.RELEASE.UTIL.LTAPE]
$ ! .REMARKS Automatically generated in Unix with make.vms command
-$ ! .DATE Mon Mar 16 12:55:56 UTC 2015
+$ ! .DATE Thu May 21 14:15:39 UTC 2015
$ !
$ !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ !
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git
More information about the debian-science-commits
mailing list