Changeset 13573


Ignore:
Timestamp:
Sep 22, 2019 8:26:14 AM (3 months ago)
Author:
Christian Andersson
Message:

Updated handling for calling convention. Related to ticket:5837

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-cw-evaluator/RuntimeLibrary/src/evaluator/jmi_evaluator.c

    r13572 r13573  
    3535JMI_ARRAY_TYPE(R_ddddddddddd, R_ddddddddddd_a)
    3636
    37 typedef const char* (__stdcall *f_s_sii)(const char*, int, int);
    38 typedef double (__stdcall *f_d_dd)(double, double);
    39 typedef double (__stdcall *f_d_i)(int);
    40 typedef double(__stdcall *f_d_idd)(int, double, double);
    41 typedef int (__stdcall *f_i_ii)(int, int);
    42 typedef int (__stdcall *f_i_s)(const char*);
    43 typedef int (__stdcall *f_i_si)(const char*, int);
    44 typedef int (__stdcall *f_i_ssi)(const char*, const char*, int);
    45 typedef void(__stdcall *f___iddpR_ddddddddddd_)(int, double, double, R_ddddddddddd**);
    46 typedef void(__stdcall *f___ddpd)(double, double, double*);
     37#define JMI_EVAL_CALLING_CONVENTION
     38
     39typedef const char* (JMI_EVAL_CALLING_CONVENTION *f_s_sii)(const char*, int, int);
     40typedef double (JMI_EVAL_CALLING_CONVENTION *f_d_dd)(double, double);
     41typedef double (JMI_EVAL_CALLING_CONVENTION *f_d_i)(int);
     42typedef double(JMI_EVAL_CALLING_CONVENTION *f_d_idd)(int, double, double);
     43typedef int (JMI_EVAL_CALLING_CONVENTION *f_i_ii)(int, int);
     44typedef int (JMI_EVAL_CALLING_CONVENTION *f_i_s)(const char*);
     45typedef int (JMI_EVAL_CALLING_CONVENTION *f_i_si)(const char*, int);
     46typedef int (JMI_EVAL_CALLING_CONVENTION *f_i_ssi)(const char*, const char*, int);
     47typedef void(JMI_EVAL_CALLING_CONVENTION *f___iddpR_ddddddddddd_)(int, double, double, R_ddddddddddd**);
     48typedef void(JMI_EVAL_CALLING_CONVENTION *f___ddpd)(double, double, double*);
    4749typedef void (*generic_funcptr)(void);
    4850
Note: See TracChangeset for help on using the changeset viewer.