Changeset 996

Timestamp:

May 11, 2016 3:38:07 PM (6 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:

• EventLoadWave.cpp (modified) (4 diffs)
• EventLoadWave.h (modified) (1 diff)

sans/XOP_Dev/EventLoader/EventLoadWave.cpp

@@ -759 +759 @@
         numRows = (CountInt)counter.XYevents;
         
-//      sprintf(bufStr,"numCol = %d, numRows = %d\r",numColumns,numRows);
+//      sprintf(bufStr,"numCol = %d, numRows = %lld\r",numColumns,(SInt64)numRows);
 //      XOPNotice(bufStr);
         
@@ -780 +780 @@
 //              XOPNotice(bufStr);
                 if (err) {
-                        sprintf(bufStr,"FileLoaderMakeWave returned an error  numCol = %d, numRows = %d\r",numColumns,numRows);
+                        sprintf(bufStr,"FileLoaderMakeWave returned an error  numCol = %d, numRows = %lld\r",numColumns,(SInt64)numRows);
                         XOPNotice(bufStr);
                         break;          // NOTE: In this case, not all fields in caPtr are set.
@@ -978 +978 @@
 */
 HOST_IMPORT int
-main(IORecHandle ioRecHandle)
+XOPMain(IORecHandle ioRecHandle)
 {
         int err;
@@ -985 +985 @@
         SetXOPEntry(XOPEntry);                          // Set entry point for future calls.
 
-        if (igorVersion < 600) {                        // Requires Igor Pro 6.00 or later.
+        if (igorVersion < 620) {                        // Requires Igor Pro 6.20 or later.
                 SetXOPResult(OLD_IGOR);                 // OLD_IGOR is defined in EventLoadWave.h and there are corresponding error strings in EventLoadWave.r and EventLoadWaveWinCustom.rc.
                 return EXIT_FAILURE;

sans/XOP_Dev/EventLoader/EventLoadWave.h

@@ -50 +50 @@
 // In EventLoadWave.c
 int LoadWave(int calledFromFunction, int flags, const char* baseName, const char* symbolicPathName, const char* fileParam);
-HOST_IMPORT int main(IORecHandle ioRecHandle);
+HOST_IMPORT int XOPMain(IORecHandle ioRecHandle);
 
 // In EventLoadWaveOperation.c