* #9037: moved CHECK macro into separate header

daemon/src/logger.h

@@ -46,9 +46,6 @@ bool getDebugMode();
 #define INFO(...)	Logger::log(LOG_INFO, __VA_ARGS__)
 #define DEBUG(...)	Logger::log(LOG_DEBUG, __VA_ARGS__)
 
-// If condition A is false, print the error message in M and exit thread
-#define CHECK(A, M, ...) if (!(A)) { ERROR(M, ##__VA_ARGS__); ost::Thread::exit(); }
-
 #define BLACK "\033[22;30m"
 #define RED "\033[22;31m"
 #define GREEN "\033[22;32m"

daemon/src/video/Makefile.am

@@ -11,7 +11,7 @@ libvideo_la_SOURCES = video_endpoint.cpp video_endpoint.h libav_utils.cpp \
 					  video_v4l2_list.cpp video_v4l2.h video_v4l2_list.h \
 					  video_preferences.h video_preferences.cpp \
 					  packet_handle.h packet_handle.cpp shared_memory.cpp \
-					  shared_memory.h
+					  shared_memory.h check.h
 
 libvideo_la_LIBADD = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ @CCRTP_LIBS@ @UDEV_LIBS@
 

daemon/src/video/check.h

+/*
+ *  Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
+ *  Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  Additional permission under GNU GPL version 3 section 7:
+ *
+ *  If you modify this program, or any covered work, by linking or
+ *  combining it with the OpenSSL project's OpenSSL library (or a
+ *  modified version of that library), containing parts covered by the
+ *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ *  grants you additional permission to convey the resulting work.
+ *  Corresponding Source for a non-source form of such a combination
+ *  shall include the source code for the parts of OpenSSL used as well
+ *  as that of the covered work.
+ */
+
+#ifndef CHECK_H_
+#define CHECK_H_
+
+#include "logger.h"
+
+// If condition A is false, print the error message in M and exit thread
+#define CHECK(A, M, ...) if (!(A)) { ERROR(M, ##__VA_ARGS__); ost::Thread::exit(); }
+
+#endif // CHECK_H_

daemon/src/video/video_receive_thread.cpp

@@ -31,6 +31,7 @@
 
 #include "video_receive_thread.h"
 #include "packet_handle.h"
+#include "check.h"
 
 // libav includes
 extern "C" {

daemon/src/video/video_send_thread.cpp

@@ -30,6 +30,7 @@
 
 #include "video_send_thread.h"
 #include "packet_handle.h"
+#include "check.h"
 
 // libav includes
 extern "C" {