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_Main.c

    r812 r834  
    415415 main() does any necessary initialization and then sets the XOPEntry field of the 
    416416 ioRecHandle to the address to be called for future messages. 
     417  
     418 changed for TK6 30JAN2012 SRK 
    417419 */ 
    418 HOST_IMPORT void 
     420HOST_IMPORT int 
    419421main(IORecHandle ioRecHandle) 
    420422{        
     
    422424        SetXOPEntry(XOPEntry);                                                  // Set entry point for future calls. 
    423425         
    424         if (igorVersion < 600)                          // Requires Igor Pro 6.00 or later. 
    425                 SetXOPResult(OLD_IGOR);                 // OLD_IGOR is defined in WaveAccess.h and there are corresponding error strings in WaveAccess.r and WaveAccessWinCustom.rc. 
    426         else 
    427                 SetXOPResult(0L); 
    428 } 
     426        if (igorVersion < 600)  {                                       // Requires Igor Pro 6.00 or later. 
     427                SetXOPResult(IGOR_OBSOLETE);     
     428                return EXIT_FAILURE; 
     429        } 
     430 
     431        SetXOPResult(0); 
     432        return EXIT_SUCCESS; 
     433         
     434} 
Note: See TracChangeset for help on using the changeset viewer.