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/SANSAnalysis/XOP/SANSAnalysis.c

    r756 r834  
    362362main() does any necessary initialization and then sets the XOPEntry field of the 
    363363ioRecHandle to the address to be called for future messages. 
     364  
     365 updated for TK6 30JAN2012 SRK 
    364366*/ 
    365 HOST_IMPORT void 
     367HOST_IMPORT int                                         // was void 
    366368main(IORecHandle ioRecHandle) 
    367369{        
     
    371373        if (igorVersion < 600) {                                                // checks required for ThreadSafe declarations 
    372374                SetXOPResult(IGOR_OBSOLETE); 
     375                return EXIT_FAILURE;                                    // added for TK6 
    373376        } 
    374         else { 
    375                 if (igorVersion >= 700) 
    376                         SetXOPResult(IGOR_OBSOLETE); 
    377                 else 
    378                         SetXOPResult(0L); 
    379         } 
     377         
     378        SetXOPResult(0); 
     379        return EXIT_SUCCESS;                                    // added for TK6 
     380         
     381//      else { 
     382//              if (igorVersion >= 700) 
     383//                      SetXOPResult(IGOR_OBSOLETE); 
     384//              else 
     385//                      SetXOPResult(0L); 
     386//      } 
     387         
    380388} 
    381389 
Note: See TracChangeset for help on using the changeset viewer.