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

    r756 r834  
    11// header for SphereFit.c 
    22 
    3 #include "XOPStructureAlignmentTwoByte.h" 
     3#pragma pack(2) 
    44 
    55/* structs */ 
     
    1818 
    1919 
    20 #include "XOPStructureAlignmentReset.h" 
     20#pragma pack() 
    2121 
    2222/* IGOR Fit Functions */ 
Note: See TracChangeset for help on using the changeset viewer.