Changeset 996 for sans/XOP_Dev


Ignore:
Timestamp:
May 11, 2016 3:38:07 PM (7 years ago)
Author:
srkline
Message:

changes to the project and files for Toolkit 7, Xcode 7, and 64-bit version of Event Loader XOP

Successful on Mac, untested on Ein (don't have a machine or compiler yet)

Location:
sans/XOP_Dev/EventLoader
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sans/XOP_Dev/EventLoader/EventLoadWave.cpp

    r878 r996  
    759759        numRows = (CountInt)counter.XYevents; 
    760760         
    761 //      sprintf(bufStr,"numCol = %d, numRows = %d\r",numColumns,numRows); 
     761//      sprintf(bufStr,"numCol = %d, numRows = %lld\r",numColumns,(SInt64)numRows); 
    762762//      XOPNotice(bufStr); 
    763763         
     
    780780//              XOPNotice(bufStr); 
    781781                if (err) { 
    782                         sprintf(bufStr,"FileLoaderMakeWave returned an error  numCol = %d, numRows = %d\r",numColumns,numRows); 
     782                        sprintf(bufStr,"FileLoaderMakeWave returned an error  numCol = %d, numRows = %lld\r",numColumns,(SInt64)numRows); 
    783783                        XOPNotice(bufStr); 
    784784                        break;          // NOTE: In this case, not all fields in caPtr are set. 
     
    978978*/ 
    979979HOST_IMPORT int 
    980 main(IORecHandle ioRecHandle) 
     980XOPMain(IORecHandle ioRecHandle) 
    981981{ 
    982982        int err; 
     
    985985        SetXOPEntry(XOPEntry);                          // Set entry point for future calls. 
    986986 
    987         if (igorVersion < 600) {                        // Requires Igor Pro 6.00 or later. 
     987        if (igorVersion < 620) {                        // Requires Igor Pro 6.20 or later. 
    988988                SetXOPResult(OLD_IGOR);                 // OLD_IGOR is defined in EventLoadWave.h and there are corresponding error strings in EventLoadWave.r and EventLoadWaveWinCustom.rc. 
    989989                return EXIT_FAILURE; 
  • sans/XOP_Dev/EventLoader/EventLoadWave.h

    r878 r996  
    5050// In EventLoadWave.c 
    5151int LoadWave(int calledFromFunction, int flags, const char* baseName, const char* symbolicPathName, const char* fileParam); 
    52 HOST_IMPORT int main(IORecHandle ioRecHandle); 
     52HOST_IMPORT int XOPMain(IORecHandle ioRecHandle); 
    5353 
    5454// In EventLoadWaveOperation.c 
Note: See TracChangeset for help on using the changeset viewer.