*** empty log message ***

diff --git a/allParam/Makefile b/allParam/Makefile
index 1e4f04d3e2eea0f552a60ccf9b944257e9e71414..d234903ea2b438b11c5cd46f46eb744fc70af3e3 100644 (file)
--- a/allParam/Makefile
+++ b/allParam/Makefile
@@ -5,12 +5,16 @@ LIBDIR = $(HOME)/lib/$(SYSTYPE)
 INCDIR = $(HOME)/include
 
 ARFLAGS = -rc
-PARAMLIBES = caParam tclParam
+PARAMLIBES = caParam tclParam ncaParam ntclParam fileParam psqlParam oraParam
 CXXPARAMOBJS = ora/ora tcl/tcl tcl/struct file/file param/enh
 
-VPATH = ca:tcl
+VPATH = ca:tcl:nca:ntcl:file:psql:ora
 
-all : $(patsubst %,lib%.a,$(PARAMLIBES)) libcxxParam.a
+all : c cxx
+
+c : $(patsubst %,lib%.a,$(PARAMLIBES)) 
+
+cxx : libcxxParam.a
 
 libcxxParam.a : $(patsubst %,%Param.o,$(CXXPARAMOBJS))
        $(AR) $(ARFLAGS) $@ $?

diff --git a/allParam/ora/Makefile b/allParam/ora/Makefile
index ff9adacf45237ebbd062487b2a3986fa950cf200..fc2f79331e529874892d4a7d88366fa42caa1d4d 100644 (file)
--- a/allParam/ora/Makefile
+++ b/allParam/ora/Makefile
@@ -1,3 +1,4 @@
+CFLAGS = -g -I../param -I$(ORACLE_HOME)/precomp/public/
 CXXFLAGS = -g -I../param -I$(ORACLE_HOME)/precomp/public/
 
 ORACLE_HOME = /usr/local/oracle/product/8.0.5

diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc
index 8c1819a6e981dcc1ba7a1caa97acd5b2bc483f9c..155dc4ff8277f0833284c68ed904b73ba5f518d0 100644 (file)
--- a/allParam/ora/oraParam.pc
+++ b/allParam/ora/oraParam.pc
@@ -16,7 +16,7 @@ void desParam(Param *my)
 {
 }
 
-int Param_getInt(const Param *my, const char *n, const char *i, int *v)
+int Param_getInt(const Param *my, const char *n, const char *i, unsigned long int *v)
 {
        return Param_getIntArray(my, n, i, 1, v);
 }
@@ -26,7 +26,7 @@ int Param_getString(const Param *my, const char *n, const char *i, char *v)
        return Param_getStringArray(my, n, i, 1, &v);
 }
 
-int Param_getIntArray(const Param *my, const char *n, const char *i, int num, int *v)
+int Param_getIntArray(const Param *my, const char *n, const char *i, int num, unsigned long int *v)
 {
        for (int i = 0 ; i<num ; i++) {
                v[i] = 0;

diff --git a/allParam/psql/psqlParam.c b/allParam/psql/psqlParam.c
index 8c1819a6e981dcc1ba7a1caa97acd5b2bc483f9c..2c491f57afbd229af1f077c5d82c67865c891e40 100644 (file)
--- a/allParam/psql/psqlParam.c
+++ b/allParam/psql/psqlParam.c
@@ -1,10 +1,5 @@
 #define _POSIX_C_SOURCE 199509L
 
-/* Oracle communication area */
-#include <oraca.h>
-/* SQL communication area */ 
-#include <sqlca.h>
-
 #include "param.h"
 
 int conParam(Param *my)
@@ -16,28 +11,30 @@ void desParam(Param *my)
 {
 }
 
-int Param_getInt(const Param *my, const char *n, const char *i, int *v)
+int Param_getInt(const Param *my, const char *name, const char *idx, unsigned long int *val)
 {
-       return Param_getIntArray(my, n, i, 1, v);
+       return Param_getIntArray(my, name, idx, 1, val);
 }
 
-int Param_getString(const Param *my, const char *n, const char *i, char *v)
+int Param_getString(const Param *my, const char *name, const char *idx, char *v)
 {
-       return Param_getStringArray(my, n, i, 1, &v);
+       return Param_getStringArray(my, name, idx, 1, &val);
 }
 
-int Param_getIntArray(const Param *my, const char *n, const char *i, int num, int *v)
+int Param_getIntArray(const Param *my, const char *name, const char *idx, int num, unsigned long int *val)
 {
-       for (int i = 0 ; i<num ; i++) {
-               v[i] = 0;
+       int i;
+       for (i = 0 ; i<num ; i++) {
+               val[i] = 0;
        }
        return num;
 }
 
-int Param_getStringArray(const Param *my, const char *n, const char *i, int num, char **v)
+int Param_getStringArray(const Param *my, const char *name, const char *idx, int num, char **val)
 {
-       for (int i = 0 ; i<num ; i++) {
-               v[i] = "Blub";
+       int i;
+       for (i = 0 ; i<num ; i++) {
+               val[i] = "Blub";
        }
        return num;
 }

diff --git a/allParam/tcl/tclParam.c b/allParam/tcl/tclParam.c
index eef46d7a4cf218b73bb6c52c18ff1b1839bc805e..f1f0b537e5aeeeea0a9194a793fe7213dad601dd 100644 (file)
--- a/allParam/tcl/tclParam.c
+++ b/allParam/tcl/tclParam.c
@@ -7,6 +7,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <hadesstd.h>
+
 #include "param.h"
 
 int conParam(Param *my)
@@ -39,7 +41,7 @@ void desParam(Param *my)
        Tcl_DeleteInterp(my->interp);
 }
 
-int Param_getInt(const Param *my, const char *name, const char *idx, int *val)
+int Param_getInt(const Param *my, const char *name, const char *idx, unsigned long int *val)
 {
        int status;
        char valstr[PARAM_MAX_VALUE_LEN];
@@ -67,12 +69,13 @@ int Param_getString(const Param *my, const char *name, const char *idx, char *va
        return 1;
 }
 
-int Param_getIntArray(const Param *my, const char *name, const char *idx, int num, int *val)
+int Param_getIntArray(const Param *my, const char *name, const char *idx, int num, unsigned long int *val)
 {
        int status;
        int tmp;
+       int i;
        char index[PARAM_MAX_NAME_LEN];
-       for (int i = 0 ; i < num ; i++) {
+       for (i = 0 ; i < num ; i++) {
                sprintf(index,"%s%d", idx, i);
                if ((tmp = Param_getInt(my, name, index, val[i]) == 1) && (status >= 0)) {
                        status++;
@@ -88,8 +91,9 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 {
        int status;
        int tmp;
+       int i;
        char index[PARAM_MAX_NAME_LEN];
-       for (int i = 0 ; i < num ; i++) {
+       for (i = 0 ; i < num ; i++) {
                sprintf(index,"%s%d", idx, i);
                if ((tmp = Param_getString(my, name, index, val[i]) == 1) && (status >= 0)) {
                        status++;