Merged with pythia6_address.c

diff --git a/PYTHIA6/pythia6_common_address.c b/PYTHIA6/pythia6_common_address.c
index e53e7e867330df01454344850021226cfa8a488f..dc91d78160d09eab603430a3730ee475f1d2f1fd 100644 (file)
--- a/PYTHIA6/pythia6_common_address.c
+++ b/PYTHIA6/pythia6_common_address.c
@@ -71,6 +71,7 @@ int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16];
 int pyints[2*20];
 int pybins[4+1000+2*20000];
 
+
 void *pythia6_common_address(const char* name) {
    if      (!strcmp(name,"PYJETS")) return pyjets;
    else if (!strcmp(name,"PYDAT1")) return pydat1;
@@ -96,4 +97,38 @@ void *pythia6_common_address(const char* name) {
    else if (!strcmp(name,"PYBINS")) return pybins;
    return 0;
 }
-   
+
+#if defined(CERNLIB_WINNT)
+#  define pythia6_addressc PYTHIA^_ADDRESSC
+#  define pythia6_addressf PYTHIA^_ADDRESSF
+#  define pythia6_addressi PYTHIA^_ADDRESSI
+#  define pythia6_addressd PYTHIA^_ADDRESSD
+#  define type_of_call _stdcall
+#else
+#  define pythia6_addressc pythia6_addressc_
+#  define pythia6_addressf pythia6_addressf_
+#  define pythia6_addressi pythia6_addressi_
+#  define pythia6_addressd pythia6_addressd_
+#  define type_of_call
+#endif
+
+char* type_of_call pythia6_addressc(char *arg)
+{
+  return arg;
+}
+int*  type_of_call pythia6_addressi(int  *arg)
+{
+  return arg;
+}
+float* type_of_call pythia6_addressf(float *arg)
+{
+  return arg;
+}
+double* type_of_call pythia6_addressd(double *arg)
+{
+  return arg;
+}
+
+
+
+