Ignore:
Timestamp:
Jan 31, 2012 12:13:39 PM (11 years ago)
Author:
srkline
Message:

Changes to the XOP code to upgrade to ToolKit? v6. Changes are the ones outlined in the Appendix A of the TK6 manual. SOme of the XOP support routines and the #pragma for 2-byte structures have changed. Per Howard Rodstein, there is no need to change the c files to cpp. c should work and compile just fine.

These changes work correctly on my mac. Next is to make sure that they work correctly on the two build machines.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/XOP_Dev/MonteCarlo/MonteCarlo.h

    r812 r834  
    2020  
    2121/* Prototypes */ 
    22 HOST_IMPORT void main(IORecHandle ioRecHandle); 
     22// for TK6 
     23HOST_IMPORT int main(IORecHandle ioRecHandle); 
    2324 
    2425  
    25 #define OLD_IGOR 1 + FIRST_XOP_ERR 
     26//#define OLD_IGOR 1 + FIRST_XOP_ERR 
    2627#define NON_EXISTENT_WAVE 2 + FIRST_XOP_ERR 
    2728#define NEEDS_2D_WAVE 3 + FIRST_XOP_ERR 
     
    2930 
    3031// All structures passed to Igor are two-byte aligned. 
    31 #include "XOPStructureAlignmentTwoByte.h" 
     32#pragma pack(2) 
    3233 
    3334struct MC_Params {     // This structure must be 2-byte-aligned because it receives parameters from Igor. 
     
    4647typedef struct MC_Params *MC_ParamsPtr; 
    4748 
    48 #include "XOPStructureAlignmentReset.h" 
    49  
     49#pragma pack()          // return to default structure packing 
    5050 
    5151// function prototypes 
Note: See TracChangeset for help on using the changeset viewer.