X-Git-Url: http://cloudbase.mooo.com/gitweb/irmp.git/blobdiff_plain/c2b70f0bf049613af736f73d9117327a5e3cf00b..43c535be41b070573e3fced6cce8ba290c7af060:/irmp.h

diff --git a/irmp.h b/irmp.h
index 8e906e0..232f531 100644
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2009-2015 Frank Meyer - frank(at)fli4l.de
  *
- * $Id: irmp.h,v 1.95 2015/05/29 08:23:56 fm Exp $
+ * $Id: irmp.h,v 1.96 2015/06/15 10:30:09 fm Exp $
  *
  * 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
@@ -82,6 +82,13 @@
 #  define IRMP_SUPPORT_RUWIDO_PROTOCOL          0
 #endif
 
+#if IRMP_SUPPORT_DENON_PROTOCOL == 1 && IRMP_SUPPORT_ACP24_PROTOCOL == 1
+#  warning DENON protocol conflicts wih ACP24, please enable only one of both protocols
+#  warning ACP24 protocol disabled
+#  undef IRMP_SUPPORT_ACP24_PROTOCOL
+#  define IRMP_SUPPORT_ACP24_PROTOCOL          0
+#endif
+
 #if IRMP_SUPPORT_RC6_PROTOCOL == 1 && IRMP_SUPPORT_ROOMBA_PROTOCOL == 1
 #  warning RC6 protocol conflicts wih ROOMBA, please enable only one of both protocols
 #  warning ROOMBA protocol disabled