Header guards not to be present in private headers

diff --git a/src/cssn.h b/src/cssn.h
index f64da3f..762c26b 100644 (file)
--- a/src/cssn.h
+++ b/src/cssn.h
@@ -19,9 +19,6 @@
  *
  */
 
-#ifndef __CSSN_H__
-#define __CSSN_H__
-
 typedef void (*mo_ss_notify_cb)(int index, void *userdata);
 typedef void (*mt_ss_notify_cb)(int index, const struct ofono_phone_number *ph,
                                void *userdata);
@@ -36,5 +33,3 @@ void ofono_mt_ss_register(struct ofono_modem *modem, int code2,
                mt_ss_notify_cb cb, void *userdata);
 void ofono_mt_ss_unregister(struct ofono_modem *modem, int code2,
                mt_ss_notify_cb cb, void *userdata);
-
-#endif

diff --git a/src/sim.h b/src/sim.h
index bf44681..e0b471d 100644 (file)
--- a/src/sim.h
+++ b/src/sim.h
@@ -19,9 +19,6 @@
  *
  */
 
-#ifndef __SIM_H__
-#define __SIM_H__
-
 typedef void (*update_spn_cb)(struct ofono_modem *modem, const char *spn,
                int home_plmn_dpy, int roaming_spn_dpy);
 
@@ -31,5 +28,3 @@ int ofono_spn_update_notify_register(struct ofono_modem *modem,
                update_spn_cb cb);
 int ofono_spn_update_notify_unregister(struct ofono_modem *modem,
                update_spn_cb cb);
-
-#endif

diff --git a/src/smsutil.h b/src/smsutil.h
index 7036335..3421833 100644 (file)
--- a/src/smsutil.h
+++ b/src/smsutil.h
@@ -19,9 +19,6 @@
  *
  */
 
-#ifndef __SMSUTIL_H__
-#define __SMSUTIL_H__
-
 #define CBS_PAYLOAD_CHARACTERS 93
 
 enum sms_type {
@@ -382,4 +379,3 @@ GSList *sms_assembly_add_fragment(struct sms_assembly *assembly,
                                        const struct sms_address *addr,
                                        guint16 ref, guint8 max, guint8 seq);
 void sms_assembly_expire(struct sms_assembly *assembly, time_t before);
-#endif

diff --git a/src/util.h b/src/util.h
index 3b97109..6269630 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -19,9 +19,6 @@
  *
  */
 
-#ifndef __UTIL_H__
-#define __UTIL_H__
-
 char *convert_gsm_to_utf8(const unsigned char *text, long len, long *items_read,
                                long *items_written, unsigned char terminator);
 unsigned char *convert_utf8_to_gsm(const char *text, long len, long *items_read,
@@ -59,5 +56,3 @@ unsigned char *pack_7bit_own_buf(const unsigned char *in, long len,
 unsigned char *pack_7bit(const unsigned char *in, long len, int byte_offset,
                                gboolean ussd,
                                long *items_written, unsigned char terminator);
-
-#endif