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.h

    r231 r834  
    55 
    66/* Prototypes */ 
    7 HOST_IMPORT void main(IORecHandle ioRecHandle); 
     7// for TK6 
     8HOST_IMPORT int main(IORecHandle ioRecHandle); 
    89 
    910// Custom error codes 
    10 #define REQUIRES_IGOR_200 1 + FIRST_XOP_ERR 
     11//#define REQUIRES_IGOR_200 1 + FIRST_XOP_ERR 
    1112#define NON_EXISTENT_WAVE 2 + FIRST_XOP_ERR 
    1213#define REQUIRES_SP_OR_DP_WAVE 3 + FIRST_XOP_ERR 
    1314 
    1415 
    15 #include "XOPStructureAlignmentTwoByte.h" 
     16#pragma pack(2) 
    1617 
    1718// Fit function parameter structure 
     
    4344}FitParams2DWeight, *FitParams2DWeightPtr; 
    4445 
    45 #include "XOPStructureAlignmentReset.h" 
     46#pragma pack() 
     47 
Note: See TracChangeset for help on using the changeset viewer.