libdvbv5: Add header guards and missing includes

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>

diff --git a/lib/include/dvb-demux.h b/lib/include/dvb-demux.h
index 80295e8..ff85bfb 100644 (file)
--- a/lib/include/dvb-demux.h
+++ b/lib/include/dvb-demux.h
@@ -26,7 +26,11 @@
  *     Copyright (c) 2011-2012 - Mauro Carvalho Chehab <mchehab@redhat.com>
  *
  */
+#ifndef _DVB_DEMUX_H
+#define _DVB_DEMUX_H
 
 int set_pesfilter(int dmxfd, int pid, int pes_type, int dvr);
 
 int get_pmt_pid(char *dmxdev, int sid);
+
+#endif

diff --git a/lib/include/dvb-fe.h b/lib/include/dvb-fe.h
index 5150ebf..5179c97 100644 (file)
--- a/lib/include/dvb-fe.h
+++ b/lib/include/dvb-fe.h
@@ -17,6 +17,8 @@
  * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  *
  */
+#ifndef _DVB_FE_H
+#define _DVB_FE_H
 
 #include <stdio.h>
 #include <errno.h>
@@ -164,3 +166,5 @@ extern const unsigned fe_bandwidth_name[8];
 extern const char *dvb_v5_name[46];
 extern const void *dvbv5_attr_names[];
 extern const char *delivery_system_name[20];
+
+#endif

diff --git a/lib/include/dvb-file.h b/lib/include/dvb-file.h
index 7e0803e..ec4cdff 100644 (file)
--- a/lib/include/dvb-file.h
+++ b/lib/include/dvb-file.h
@@ -17,7 +17,8 @@
  * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  *
  */
-
+#ifndef _DVB_FILE_H
+#define _DVB_FILE_H
 
 #include "dvb-fe.h"
 
@@ -152,3 +153,5 @@ int write_file_format(const char *fname,
                      struct dvb_file *dvb_file,
                      uint32_t delsys,
                      enum file_formats format);
+
+#endif

diff --git a/lib/include/libsat.h b/lib/include/libsat.h
index cb78cbb..1cf4af8 100644 (file)
--- a/lib/include/libsat.h
+++ b/lib/include/libsat.h
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  */
+#ifndef _LIBSAT_H
+#define _LIBSAT_H
 
 enum polarization {
        POLARIZATION_OFF        = 0,
@@ -48,3 +50,5 @@ void print_all_lnb(void);
 struct dvb_satellite_lnb *get_lnb(int i);
 int dvb_satellite_set_parms(struct dvb_v5_fe_parms *parms);
 int dvb_satellite_get_parms(struct dvb_v5_fe_parms *parms);
+
+#endif

diff --git a/lib/include/libscan.h b/lib/include/libscan.h
index 441472e..bc11ce1 100644 (file)
--- a/lib/include/libscan.h
+++ b/lib/include/libscan.h
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  */
+#ifndef _LIBSCAN_H
+#define _LIBSCAN_H
 
 #include <stdint.h>
 #include <linux/dvb/dmx.h>
@@ -140,3 +142,5 @@ struct dvb_descriptors *get_dvb_ts_tables(int dmx_fd,
                                          unsigned timeout_multiply,
                                          int verbose);
 void free_dvb_ts_tables(struct dvb_descriptors *dvb_desc);
+
+#endif

diff --git a/lib/libdvbv5/dvb-v5-std.h b/lib/libdvbv5/dvb-v5-std.h
index 80d98c0..045162c 100644 (file)
--- a/lib/libdvbv5/dvb-v5-std.h
+++ b/lib/libdvbv5/dvb-v5-std.h
@@ -19,7 +19,10 @@
  * Per-delivery system properties, according with the specs:
  *     http://linuxtv.org/downloads/v4l-dvb-apis/FE_GET_SET_PROPERTY.html
  */
+#ifndef _DVB_V5_STD_H
+#define _DVB_V5_STD_H
 
+#include <stddef.h>
 #include "dvb-frontend.h"
 
 const unsigned int sys_dvbt_props[] = {
@@ -185,3 +188,6 @@ const void *dvbv5_attr_names[] = {
        [DTV_ROLLOFF]                   = fe_rolloff_name,
        [DTV_DELIVERY_SYSTEM]           = delivery_system_name,
 };
+
+#endif
+

diff --git a/lib/libdvbv5/dvb-v5.h b/lib/libdvbv5/dvb-v5.h
index b29e34b..6610552 100644 (file)
--- a/lib/libdvbv5/dvb-v5.h
+++ b/lib/libdvbv5/dvb-v5.h
@@ -3,7 +3,10 @@
  */
 #ifndef _DVB_V5_CONSTS_H
 #define _DVB_V5_CONSTS_H
+
+#include <stddef.h>
 #include "dvb-frontend.h"
+
 struct fe_caps_name {
        unsigned  idx;
        char *name;
@@ -237,3 +240,4 @@ const char *delivery_system_name[20] = {
 };
 
 #endif
+