Changeset 102


Ignore:
Timestamp:
Apr 24, 2007 4:17:07 PM (16 years ago)
Author:
ajj
Message:

Switched to generic library header so that the XOP code doesn't have redundant defines for internal library functions.

Location:
sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/XOP
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/XOP/Cylinder.c

    r97 r102  
    99#include "XOPStandardHeaders.h"                 // Include ANSI headers, Mac headers, IgorXOP.h, XOP.h and XOPSupport.h 
    1010#include "SANSAnalysis.h" 
    11 #include "libCylinder.h" 
     11#include "libSANSAnalysis.h" 
    1212#include "Cylinder.h" 
    1313 
  • sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/XOP/Sphere.c

    r97 r102  
    99#include "XOPStandardHeaders.h"                 // Include ANSI headers, Mac headers, IgorXOP.h, XOP.h and XOPSupport.h 
    1010#include "SANSAnalysis.h" 
    11 #include "libSphere.h" 
     11#include "libSANSAnalysis.h" 
    1212#include "Sphere.h" 
    1313 
     
    1919        float *fp;                              // Pointer to single precision wave data. 
    2020        double q;               //local variables of coefficient wave 
    21          
    22         if (p->waveHandle == NIL) { 
    23                 SetNaN64(&p->result); 
    24                 return NON_EXISTENT_WAVE; 
    25         } 
    26          
    27         q= p->x; 
    28          
     21        int hState; 
     22        char buf[256]; 
     23                 
     24        if (p->waveHandle == NIL) { 
     25                SetNaN64(&p->result); 
     26                return NON_EXISTENT_WAVE; 
     27        } 
     28         
     29        q= p->x; 
     30 
    2931        switch(WaveType(p->waveHandle)){                        // We can handle single and double precision coefficient waves. 
    3032                case NT_FP32: 
  • sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/XOP/StructureFactor.c

    r97 r102  
    99#include "XOPStandardHeaders.h"                 // Include ANSI headers, Mac headers, IgorXOP.h, XOP.h and XOPSupport.h 
    1010#include "SANSAnalysis.h" 
    11 #include "libStructureFactor.h" 
     11#include "libSANSAnalysis.h" 
    1212#include "StructureFactor.h" 
    1313 
  • sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/XOP/TwoPhase.c

    r97 r102  
    77#include "XOPStandardHeaders.h"                 // Include ANSI headers, Mac headers, IgorXOP.h, XOP.h and XOPSupport.h 
    88#include "SANSAnalysis.h" 
    9 #include "libTwoPhase.h" 
     9#include "libSANSAnalysis.h" 
    1010#include "TwoPhase.h" 
    1111 
Note: See TracChangeset for help on using the changeset viewer.