mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-22 17:47:59 +02:00
moved globals from commu.h to .c and used extern. This needed for eiger g++ server compiling. Also typecasted all the mallocs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@664 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
@ -62,11 +62,10 @@ $Revision$
|
||||
/** get flag form most functions */
|
||||
#define GET_FLAG -1
|
||||
|
||||
#ifdef __cplusplus
|
||||
#if defined(__cplusplus) && !defined(EIGERD)
|
||||
|
||||
/** @short class containing all the structures, constants and enum definitions */
|
||||
class slsDetectorDefs {
|
||||
|
||||
public:
|
||||
|
||||
slsDetectorDefs(){};
|
||||
@ -565,7 +564,7 @@ enum angleConversionParameter {
|
||||
//} angleConversionConstant;
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
#if defined(__cplusplus) && !defined(EIGERD)
|
||||
protected:
|
||||
#endif
|
||||
|
||||
@ -575,7 +574,8 @@ enum angleConversionParameter {
|
||||
#include "sls_detector_funcs.h"
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
#if defined(__cplusplus) && !defined(EIGERD)
|
||||
};
|
||||
#endif
|
||||
;
|
||||
|
Reference in New Issue
Block a user