eds: move general macro definition out of edid.h

Author: compnerd

Makefile.am

@@ -3,11 +3,12 @@
 if WITH_EXAMPLES
 noinst_PROGRAMS = src/examples/parse-edid/parse-edid
 
-src_examples_parse_edid_parse_edid_SOURCES = src/examples/parse-edid/parse-edid.c \
+src_examples_parse_edid_parse_edid_CFLAGS = -I $(top_srcdir)/src                    \
+					    -I $(top_srcdir)/src/eds                \
+					    -include $(top_srcdir)/src/eds/macros.h \
+					    $(NULL)
+src_examples_parse_edid_parse_edid_SOURCES = src/examples/parse-edid/parse-edid.c   \
 					     $(NULL)
-src_examples_parse_edid_parse_edid_CFLAGS = -I $(top_srcdir)/src     \
-					    -I $(top_srcdir)/src/eds \
-					      $(NULL)
 endif
 
 edsincludedir = $(includedir)/eds

src/eds/edid.h

@@ -40,10 +40,6 @@
 #define EDID_BLOCK_SIZE                         (0x80)
 #define EDID_MAX_EXTENSIONS                     (0xfe)
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(arr)                         (sizeof(arr) / sizeof(arr[0]))
-#endif
-
 
 static const uint8_t EDID_HEADER[] = { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 };
 static const uint8_t EDID_STANDARD_TIMING_DESCRIPTOR_INVALID[] = { 0x01, 0x01 };

src/eds/macros.h

@@ -0,0 +1,37 @@
+/* vim: set et fde fdm=syntax ft=c.doxygen ts=4 sts=4 sw=4 : */
+/*
+ * Copyright © 2010-2011 Saleem Abdulrasool <[email protected]>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef eds_macros_h
+#define eds_macros_h
+
+#define ARRAY_SIZE(arr)                         (sizeof(arr) / sizeof(arr[0]))
+
+#endif
+