Revision: 4450 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=4450&view=rev Author: zmoelnig Date: 2011-08-12 12:58:56 +0000 (Fri, 12 Aug 2011)
Log Message: ----------- normalized INCLUDE protection defines Modified Paths: -------------- trunk/Gem/plugins/filmAVI/filmAVI.h trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.h trunk/Gem/plugins/filmDS/filmDS.h trunk/Gem/plugins/filmDarwin/filmDarwin.h trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h trunk/Gem/plugins/filmMPEG1/filmMPEG1.h trunk/Gem/plugins/filmMPEG3/filmMPEG3.h trunk/Gem/plugins/filmQT/filmQT.h trunk/Gem/plugins/filmQT4L/filmQT4L.h trunk/Gem/plugins/filmTEST/filmTEST.h trunk/Gem/plugins/imageJPEG/imageJPEG.h trunk/Gem/plugins/imageMAGICK/imageMAGICK.h trunk/Gem/plugins/imageQT/imageQT.h trunk/Gem/plugins/imageSGI/imageSGI.h trunk/Gem/plugins/imageTIFF/imageTIFF.h trunk/Gem/plugins/recordQT/recordQT.h trunk/Gem/plugins/recordQT4L/recordQT4L.h trunk/Gem/plugins/recordV4L/recordV4L.h trunk/Gem/plugins/recordV4L2/recordV4L2.h trunk/Gem/plugins/videoAVT/videoAVT.h trunk/Gem/plugins/videoDC1394/videoDC1394.h trunk/Gem/plugins/videoDS/videoDS.h trunk/Gem/plugins/videoDV4L/videoDV4L.h trunk/Gem/plugins/videoDarwin/videoDarwin.h trunk/Gem/plugins/videoHALCON/videoHALCON.h trunk/Gem/plugins/videoPYLON/CameraProperties.h trunk/Gem/plugins/videoPYLON/StreamGrabberProperties.h trunk/Gem/plugins/videoPYLON/videoPYLON.h trunk/Gem/plugins/videoSGI/videoSGI.h trunk/Gem/plugins/videoTEST/videoTEST.h trunk/Gem/plugins/videoUNICAP/videoUNICAP.h trunk/Gem/plugins/videoV4L/videoV4L.h trunk/Gem/plugins/videoV4L2/videoV4L2.h trunk/Gem/plugins/videoVFW/videoVFW.h Modified: trunk/Gem/plugins/filmAVI/filmAVI.h =================================================================== --- trunk/Gem/plugins/filmAVI/filmAVI.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/filmAVI/filmAVI.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -13,8 +13,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_FILMAVI_H_ -#define INCLUDE_FILMAVI_H_ +#ifndef _INCLUDE_GEMPLUGIN__FILMAVI_FILMAVI_H_ +#define _INCLUDE_GEMPLUGIN__FILMAVI_FILMAVI_H_ #include "plugins/filmBase.h" Modified: trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.h =================================================================== --- trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -13,8 +13,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_FILMAVIPLAY_H_ -#define INCLUDE_FILMAVIPLAY_H_ +#ifndef _INCLUDE_GEMPLUGIN__FILMAVIPLAY_FILMAVIPLAY_H_ +#define _INCLUDE_GEMPLUGIN__FILMAVIPLAY_FILMAVIPLAY_H_ #include "plugins/filmBase.h" #if defined (_WIN32) & defined (HAVE_LIBAVIPLAY) Modified: trunk/Gem/plugins/filmDS/filmDS.h =================================================================== --- trunk/Gem/plugins/filmDS/filmDS.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/filmDS/filmDS.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -13,8 +13,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_filmDS_H_ -#define INCLUDE_filmDS_H_ +#ifndef _INCLUDE_GEMPLUGIN__FILMDS_FILMDS_H_ +#define _INCLUDE_GEMPLUGIN__FILMDS_FILMDS_H_ #include "plugins/filmBase.h" #if defined(_WIN32) && defined(HAVE_DIRECTSHOW) Modified: trunk/Gem/plugins/filmDarwin/filmDarwin.h =================================================================== --- trunk/Gem/plugins/filmDarwin/filmDarwin.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/filmDarwin/filmDarwin.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -13,8 +13,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_FILMDARWIN_H_ -#define INCLUDE_FILMDARWIN_H_ +#ifndef _INCLUDE_GEMPLUGIN__FILMDARWIN_FILMDARWIN_H_ +#define _INCLUDE_GEMPLUGIN__FILMDARWIN_FILMDARWIN_H_ #if defined __APPLE__ && !defined __x86_64__ // with OSX10.6, apple has removed loads of Carbon functionality (in 64bit mode) Modified: trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h =================================================================== --- trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -12,8 +12,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_FILMGMERLIN_H_ -#define INCLUDE_FILMGMERLIN_H_ +#ifndef _INCLUDE_GEMPLUGIN__FILMGMERLIN_FILMGMERLIN_H_ +#define _INCLUDE_GEMPLUGIN__FILMGMERLIN_FILMGMERLIN_H_ #include "plugins/filmBase.h" #include <stdio.h> Modified: trunk/Gem/plugins/filmMPEG1/filmMPEG1.h =================================================================== --- trunk/Gem/plugins/filmMPEG1/filmMPEG1.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/filmMPEG1/filmMPEG1.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -13,8 +13,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_FILMMPEG1_H_ -#define INCLUDE_FILMMPEG1_H_ +#ifndef _INCLUDE_GEMPLUGIN__FILMMPEG1_FILMMPEG1_H_ +#define _INCLUDE_GEMPLUGIN__FILMMPEG1_FILMMPEG1_H_ #include "plugins/filmBase.h" #include <stdio.h> Modified: trunk/Gem/plugins/filmMPEG3/filmMPEG3.h =================================================================== --- trunk/Gem/plugins/filmMPEG3/filmMPEG3.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/filmMPEG3/filmMPEG3.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -13,8 +13,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_FILMMPEG3_H_ -#define INCLUDE_FILMMPEG3_H_ +#ifndef _INCLUDE_GEMPLUGIN__FILMMPEG3_FILMMPEG3_H_ +#define _INCLUDE_GEMPLUGIN__FILMMPEG3_FILMMPEG3_H_ #include "plugins/filmBase.h" #include <stdio.h> #ifdef HAVE_LIBMPEG3 Modified: trunk/Gem/plugins/filmQT/filmQT.h =================================================================== --- trunk/Gem/plugins/filmQT/filmQT.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/filmQT/filmQT.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -11,8 +11,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_FILMQT_H_ -#define INCLUDE_FILMQT_H_ +#ifndef _INCLUDE_GEMPLUGIN__FILMQT_FILMQT_H_ +#define _INCLUDE_GEMPLUGIN__FILMQT_FILMQT_H_ #include "plugins/filmBase.h" #ifdef HAVE_CARBONQUICKTIME Modified: trunk/Gem/plugins/filmQT4L/filmQT4L.h =================================================================== --- trunk/Gem/plugins/filmQT4L/filmQT4L.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/filmQT4L/filmQT4L.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -13,8 +13,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_FILMQT4L_H_ -#define INCLUDE_FILMQT4L_H_ +#ifndef _INCLUDE_GEMPLUGIN__FILMQT4L_FILMQT4L_H_ +#define _INCLUDE_GEMPLUGIN__FILMQT4L_FILMQT4L_H_ #include "plugins/filmBase.h" #include <stdio.h> Modified: trunk/Gem/plugins/filmTEST/filmTEST.h =================================================================== --- trunk/Gem/plugins/filmTEST/filmTEST.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/filmTEST/filmTEST.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -13,8 +13,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_FILMTEST_H_ -#define INCLUDE_FILMTEST_H_ +#ifndef _INCLUDE_GEMPLUGIN__FILMTEST_FILMTEST_H_ +#define _INCLUDE_GEMPLUGIN__FILMTEST_FILMTEST_H_ #include "plugins/filmBase.h" #include <stdio.h> Modified: trunk/Gem/plugins/imageJPEG/imageJPEG.h =================================================================== --- trunk/Gem/plugins/imageJPEG/imageJPEG.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/imageJPEG/imageJPEG.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -11,8 +11,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_GEM_PLUGINS_IMAGEJPEG_H_ -#define INCLUDE_GEM_PLUGINS_IMAGEJPEG_H_ +#ifndef _INCLUDE_GEMPLUGIN__IMAGEJPEG_IMAGEJPEG_H_ +#define _INCLUDE_GEMPLUGIN__IMAGEJPEG_IMAGEJPEG_H_ #include "plugins/imageBase.h" #include <stdio.h> Modified: trunk/Gem/plugins/imageMAGICK/imageMAGICK.h =================================================================== --- trunk/Gem/plugins/imageMAGICK/imageMAGICK.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/imageMAGICK/imageMAGICK.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -11,8 +11,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_GEM_PLUGINS_IMAGEMAGICK_H_ -#define INCLUDE_GEM_PLUGINS_IMAGEMAGICK_H_ +#ifndef _INCLUDE_GEMPLUGIN__IMAGEMAGICK_IMAGEMAGICK_H_ +#define _INCLUDE_GEMPLUGIN__IMAGEMAGICK_IMAGEMAGICK_H_ #include "plugins/imageBase.h" #include <stdio.h> Modified: trunk/Gem/plugins/imageQT/imageQT.h =================================================================== --- trunk/Gem/plugins/imageQT/imageQT.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/imageQT/imageQT.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -11,8 +11,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_GEM_PLUGINS_IMAGEQT_H_ -#define INCLUDE_GEM_PLUGINS_IMAGEQT_H_ +#ifndef _INCLUDE_GEMPLUGIN__IMAGEQT_IMAGEQT_H_ +#define _INCLUDE_GEMPLUGIN__IMAGEQT_IMAGEQT_H_ #include "plugins/imageBase.h" #include <stdio.h> Modified: trunk/Gem/plugins/imageSGI/imageSGI.h =================================================================== --- trunk/Gem/plugins/imageSGI/imageSGI.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/imageSGI/imageSGI.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -11,8 +11,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_GEM_PLUGINS_IMAGESGI_H_ -#define INCLUDE_GEM_PLUGINS_IMAGESGI_H_ +#ifndef _INCLUDE_GEMPLUGIN__IMAGESGI_IMAGESGI_H_ +#define _INCLUDE_GEMPLUGIN__IMAGESGI_IMAGESGI_H_ #include "plugins/imageloaderBase.h" #include <stdio.h> Modified: trunk/Gem/plugins/imageTIFF/imageTIFF.h =================================================================== --- trunk/Gem/plugins/imageTIFF/imageTIFF.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/imageTIFF/imageTIFF.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -11,8 +11,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_GEM_PLUGINS_IMAGETIFF_H_ -#define INCLUDE_GEM_PLUGINS_IMAGETIFF_H_ +#ifndef _INCLUDE_GEMPLUGIN__IMAGETIFF_IMAGETIFF_H_ +#define _INCLUDE_GEMPLUGIN__IMAGETIFF_IMAGETIFF_H_ #include "plugins/imageBase.h" #include <stdio.h> Modified: trunk/Gem/plugins/recordQT/recordQT.h =================================================================== --- trunk/Gem/plugins/recordQT/recordQT.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/recordQT/recordQT.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -8,8 +8,8 @@ */ //this will record QT movies -#ifndef INCLUDE_PLUGINS_RECORDQT_H_ -#define INCLUDE_PLUGINS_RECORDQT_H_ +#ifndef _INCLUDE_GEMPLUGIN__RECORDQT_RECORDQT_H_ +#define _INCLUDE_GEMPLUGIN__RECORDQT_RECORDQT_H_ #include "plugins/recordBase.h" Modified: trunk/Gem/plugins/recordQT4L/recordQT4L.h =================================================================== --- trunk/Gem/plugins/recordQT4L/recordQT4L.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/recordQT4L/recordQT4L.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -13,8 +13,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_PLUGINS_RECORDQT4L_H_ -#define INCLUDE_PLUGINS_RECORDQT4L_H_ +#ifndef _INCLUDE_GEMPLUGIN__RECORDQT4L_RECORDQT4L_H_ +#define _INCLUDE_GEMPLUGIN__RECORDQT4L_RECORDQT4L_H_ #include "plugins/recordBase.h" Modified: trunk/Gem/plugins/recordV4L/recordV4L.h =================================================================== --- trunk/Gem/plugins/recordV4L/recordV4L.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/recordV4L/recordV4L.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -13,8 +13,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_PLUGINS_RECORDV4L_H_ -#define INCLUDE_PLUGINS_RECORDV4L_H_ +#ifndef _INCLUDE_GEMPLUGIN__RECORDV4L_RECORDV4L_H_ +#define _INCLUDE_GEMPLUGIN__RECORDV4L_RECORDV4L_H_ #include "plugins/recordBase.h" Modified: trunk/Gem/plugins/recordV4L2/recordV4L2.h =================================================================== --- trunk/Gem/plugins/recordV4L2/recordV4L2.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/recordV4L2/recordV4L2.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -13,8 +13,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_PLUGINS_RECORDV4L2_H_ -#define INCLUDE_PLUGINS_RECORDV4L2_H_ +#ifndef _INCLUDE_GEMPLUGIN__RECORDV4L2_RECORDV4L2_H_ +#define _INCLUDE_GEMPLUGIN__RECORDV4L2_RECORDV4L2_H_ #include "plugins/recordBase.h" Modified: trunk/Gem/plugins/videoAVT/videoAVT.h =================================================================== --- trunk/Gem/plugins/videoAVT/videoAVT.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoAVT/videoAVT.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -12,8 +12,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEOAVT_H_ -#define INCLUDE_VIDEOAVT_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEOAVT_VIDEOAVT_H_ +#define _INCLUDE_GEMPLUGIN__VIDEOAVT_VIDEOAVT_H_ #include "plugins/videoBase.h" Modified: trunk/Gem/plugins/videoDC1394/videoDC1394.h =================================================================== --- trunk/Gem/plugins/videoDC1394/videoDC1394.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoDC1394/videoDC1394.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -14,8 +14,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEODC1394_H_ -#define INCLUDE_VIDEODC1394_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEODC1394_VIDEODC1394_H_ +#define _INCLUDE_GEMPLUGIN__VIDEODC1394_VIDEODC1394_H_ #include "plugins/videoBase.h" Modified: trunk/Gem/plugins/videoDS/videoDS.h =================================================================== --- trunk/Gem/plugins/videoDS/videoDS.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoDS/videoDS.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -9,8 +9,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEODS_H_ -#define INCLUDE_VIDEODS_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEODS_VIDEODS_H_ +#define _INCLUDE_GEMPLUGIN__VIDEODS_VIDEODS_H_ #include "plugins/videoBase.h" Modified: trunk/Gem/plugins/videoDV4L/videoDV4L.h =================================================================== --- trunk/Gem/plugins/videoDV4L/videoDV4L.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoDV4L/videoDV4L.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -14,8 +14,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEODV4L_H_ -#define INCLUDE_VIDEODV4L_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEODV4L_VIDEODV4L_H_ +#define _INCLUDE_GEMPLUGIN__VIDEODV4L_VIDEODV4L_H_ #include "plugins/videoBase.h" #if defined HAVE_LIBIEC61883 && defined HAVE_LIBRAW1394 && defined HAVE_LIBDV Modified: trunk/Gem/plugins/videoDarwin/videoDarwin.h =================================================================== --- trunk/Gem/plugins/videoDarwin/videoDarwin.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoDarwin/videoDarwin.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -11,8 +11,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEODARWIN_H_ -#define INCLUDE_VIDEODARWIN_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEODARWIN_VIDEODARWIN_H_ +#define _INCLUDE_GEMPLUGIN__VIDEODARWIN_VIDEODARWIN_H_ #include "plugins/videoBase.h" Modified: trunk/Gem/plugins/videoHALCON/videoHALCON.h =================================================================== --- trunk/Gem/plugins/videoHALCON/videoHALCON.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoHALCON/videoHALCON.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -18,8 +18,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEOHALCON_H_ -#define INCLUDE_VIDEOHALCON_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEOHALCON_VIDEOHALCON_H_ +#define _INCLUDE_GEMPLUGIN__VIDEOHALCON_VIDEOHALCON_H_ #include "plugins/videoBase.h" Modified: trunk/Gem/plugins/videoPYLON/CameraProperties.h =================================================================== --- trunk/Gem/plugins/videoPYLON/CameraProperties.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoPYLON/CameraProperties.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -1,5 +1,5 @@ -#ifndef INCLUDE_CAMERA_PROPERTIES_H_ -#define INCLUDE_CAMERA_PROPERTIES_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEOPYLON_CAMERAPROPERTIES_H_ +#define _INCLUDE_GEMPLUGIN__VIDEOPYLON_CAMERAPROPERTIES_H_ #include "pylon/PylonIncludes.h" #include <pylon/gige/BaslerGigECamera.h> @@ -23,4 +23,4 @@ };};}; -#endif /* INCLUDE_CAMERA_PROPERTIES_H_ */ +#endif /* _INCLUDE_GEMPLUGIN__VIDEOPYLON_CAMERAPROPERTIES_H_ */ Modified: trunk/Gem/plugins/videoPYLON/StreamGrabberProperties.h =================================================================== --- trunk/Gem/plugins/videoPYLON/StreamGrabberProperties.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoPYLON/StreamGrabberProperties.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -1,5 +1,5 @@ -#ifndef INCLUDE_STREAMGRABBER_PROPERTIES_H_ -#define INCLUDE_STREAMGRABBER_PROPERTIES_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEOPYLON_STREAMGRABBERPROPERTIES_H_ +#define _INCLUDE_GEMPLUGIN__VIDEOPYLON_STREAMGRABBERPROPERTIES_H_ #include "pylon/PylonIncludes.h" # include <pylon/gige/BaslerGigECamera.h> @@ -23,4 +23,4 @@ };};}; -#endif /* INCLUDE_STREAMGRABBER_PROPERTIES_H_ */ +#endif /* _INCLUDE_GEMPLUGIN__VIDEOPYLON_STREAMGRABBERPROPERTIES_H_ */ Modified: trunk/Gem/plugins/videoPYLON/videoPYLON.h =================================================================== --- trunk/Gem/plugins/videoPYLON/videoPYLON.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoPYLON/videoPYLON.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -14,8 +14,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEOPYLON_H_ -#define INCLUDE_VIDEOPYLON_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEOPYLON_VIDEOPYLON_H_ +#define _INCLUDE_GEMPLUGIN__VIDEOPYLON_VIDEOPYLON_H_ #include "plugins/videoBase.h" #include <map> Modified: trunk/Gem/plugins/videoSGI/videoSGI.h =================================================================== --- trunk/Gem/plugins/videoSGI/videoSGI.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoSGI/videoSGI.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -14,8 +14,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEOSGI_H_ -#define INCLUDE_VIDEOSGI_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEOSGI_VIDEOSGI_H_ +#define _INCLUDE_GEMPLUGIN__VIDEOSGI_VIDEOSGI_H_ #include "plugins/videoBase.h" Modified: trunk/Gem/plugins/videoTEST/videoTEST.h =================================================================== --- trunk/Gem/plugins/videoTEST/videoTEST.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoTEST/videoTEST.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -1,5 +1,5 @@ -#ifndef INCLUDE_GEM_VIDEOTEST_H_ -#define INCLUDE_GEM_VIDEOTEST_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEOTEST_VIDEOTEST_H_ +#define _INCLUDE_GEMPLUGIN__VIDEOTEST_VIDEOTEST_H_ #include "plugins/video.h" #include "Gem/Image.h" Modified: trunk/Gem/plugins/videoUNICAP/videoUNICAP.h =================================================================== --- trunk/Gem/plugins/videoUNICAP/videoUNICAP.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoUNICAP/videoUNICAP.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -12,8 +12,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEOUNICAP_H_ -#define INCLUDE_VIDEOUNICAP_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEOUNICAP_VIDEOUNICAP_H_ +#define _INCLUDE_GEMPLUGIN__VIDEOUNICAP_VIDEOUNICAP_H_ #include "plugins/videoBase.h" Modified: trunk/Gem/plugins/videoV4L/videoV4L.h =================================================================== --- trunk/Gem/plugins/videoV4L/videoV4L.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoV4L/videoV4L.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -14,8 +14,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEOV4L_H_ -#define INCLUDE_VIDEOV4L_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEOV4L_VIDEOV4L_H_ +#define _INCLUDE_GEMPLUGIN__VIDEOV4L_VIDEOV4L_H_ #include "plugins/videoBase.h" Modified: trunk/Gem/plugins/videoV4L2/videoV4L2.h =================================================================== --- trunk/Gem/plugins/videoV4L2/videoV4L2.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoV4L2/videoV4L2.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -12,8 +12,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEOV4L2_H_ -#define INCLUDE_VIDEOV4L2_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEOV4L2_VIDEOV4L2_H_ +#define _INCLUDE_GEMPLUGIN__VIDEOV4L2_VIDEOV4L2_H_ #include "plugins/videoBase.h" Modified: trunk/Gem/plugins/videoVFW/videoVFW.h =================================================================== --- trunk/Gem/plugins/videoVFW/videoVFW.h 2011-08-12 12:55:12 UTC (rev 4449) +++ trunk/Gem/plugins/videoVFW/videoVFW.h 2011-08-12 12:58:56 UTC (rev 4450) @@ -12,8 +12,8 @@ -----------------------------------------------------------------*/ -#ifndef INCLUDE_VIDEOVFW_H_ -#define INCLUDE_VIDEOVFW_H_ +#ifndef _INCLUDE_GEMPLUGIN__VIDEOVFW_VIDEOVFW_H_ +#define _INCLUDE_GEMPLUGIN__VIDEOVFW_VIDEOVFW_H_ #include "plugins/videoBase.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Get a FREE DOWNLOAD! and learn more about uberSVN rich system, user administration capabilities and model configuration. Take the hassle out of deploying and managing Subversion and the tools developers use with it. http://p.sf.net/sfu/wandisco-dev2dev _______________________________________________ pd-gem-CVS mailing list pd-gem-CVS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/pd-gem-cvs