*** empty log message ***

diff --git a/allParam/ora/Makefile b/allParam/ora/Makefile
index fc2f79331e529874892d4a7d88366fa42caa1d4d..9eaac4d96dee924b42ce08aaf69b53549bf9198f 100644 (file)
--- a/allParam/ora/Makefile
+++ b/allParam/ora/Makefile
@@ -5,7 +5,9 @@ ORACLE_HOME = /usr/local/oracle/product/8.0.5
 ORA_USER = hades/hades@db-hades.gsi.de
 
 PROC = $(ORACLE_HOME)/bin/proc
-PROCFLAGS = oraca=yes code=cpp parse=partial sqlcheck=semantics \
+PROCFLAGS = oraca=yes parse=partial sqlcheck=semantics \
+  userid=$(ORA_USER) ireclen=130 oreclen=130
+PROCPPFLAGS = oraca=yes code=cpp parse=partial sqlcheck=semantics \
   userid=$(ORA_USER) ireclen=130 oreclen=130
 
 PROC_INCLUDES = include=/usr/include include=/usr/include/g++-2 \
@@ -26,7 +28,7 @@ param.c : param.pc
 oraParam.o : oraParam.cc oraParam.h ../param/enhParam.h
 
 oraParam.cc : oraParam.pc
-       $(PROC) $(PROCFLAGS) $(PROC_INCLUDES) iname=$< oname=$@
+       $(PROC) $(PROCPPFLAGS) $(PROC_INCLUDES) iname=$< oname=$@
 
 clean :
        rm -f *.o param.c param.lis oraParam.cc oraParam.lis

diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc
index 155dc4ff8277f0833284c68ed904b73ba5f518d0..29609a4b565a17fd0fa3691dbea0c30fb23cc171 100644 (file)
--- a/allParam/ora/oraParam.pc
+++ b/allParam/ora/oraParam.pc
@@ -16,28 +16,30 @@ void desParam(Param *my)
 {
 }
 
-int Param_getInt(const Param *my, const char *n, const char *i, unsigned long 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 *val)
 {
-       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, unsigned long 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/psql/Makefile b/allParam/psql/Makefile
index 11c3685d2ae0a426678443b616a08fc4c8e92b38..16a47680790cbd05f19dbcf5f647fcd18033bddc 100644 (file)
--- a/allParam/psql/Makefile
+++ b/allParam/psql/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -g
+CFLAGS = -g -I/usr/include/pgsql
 
 libpsqlParam.a : param.o
        $(AR) $(ARFLAGS) $@ $<

diff --git a/allParam/psql/psqlParam.c b/allParam/psql/psqlParam.c
index 2c491f57afbd229af1f077c5d82c67865c891e40..f836850dea90c82c5aa302cc87485dc6ca150a02 100644 (file)
--- a/allParam/psql/psqlParam.c
+++ b/allParam/psql/psqlParam.c
@@ -1,5 +1,7 @@
 #define _POSIX_C_SOURCE 199509L
 
+#include <libpq-fe.h>
+
 #include "param.h"
 
 int conParam(Param *my)
@@ -16,7 +18,7 @@ int Param_getInt(const Param *my, const char *name, const char *idx, unsigned lo
        return Param_getIntArray(my, name, idx, 1, val);
 }
 
-int Param_getString(const Param *my, const char *name, const char *idx, char *v)
+int Param_getString(const Param *my, const char *name, const char *idx, char *val)
 {
        return Param_getStringArray(my, name, idx, 1, &val);
 }