cleanup C reserved identifer violation (JANITOR-3)

diff --git a/src/include/g711.h b/src/include/g711.h
index ec75e3967c887a00b64c17a7edd00583b5e427df..53f3afc87e89dd79904d27a7bc93e6928d50fcb6 100644 (file)
--- a/src/include/g711.h
+++ b/src/include/g711.h
@@ -39,8 +39,8 @@ difficult to achieve the precise transcoding procedure laid down in the G.711
 specification by other means.
 */
 
-#if !defined(_G711_H_)
-#define _G711_H_
+#if !defined(FREESWITCH_G711_H)
+#define FREESWITCH_G711_H
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/include/switch_dso.h b/src/include/switch_dso.h
index 052cd5b5d392254bb9c3ee8ebd7ea4e712728126..a715e02cf1939d601a63fd405b828b11c2b61cf8 100644 (file)
--- a/src/include/switch_dso.h
+++ b/src/include/switch_dso.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SWITCH_DSO_H
-#define _SWITCH_DSO_H
+#ifndef FREESWITCH_DSO_H
+#define FREESWITCH_DSO_H
 
 typedef int (*switch_dso_func_t) (void);
 #ifdef WIN32

diff --git a/src/include/switch_nat.h b/src/include/switch_nat.h
index 87ba3190ff121a19f22191cf08c7dfaf1e47ddcd..ced175ba47be3e3f5458e0df583e6b9926859a2a 100644 (file)
--- a/src/include/switch_nat.h
+++ b/src/include/switch_nat.h
@@ -35,8 +35,8 @@
   \ingroup core1
   \{
 */
-#ifndef _SWITCH_NAT_H
-#define _SWITCH_NAT_H
+#ifndef FREESWITCH_NAT_H
+#define FREESWITCH_NAT_H
 
 SWITCH_BEGIN_EXTERN_C typedef enum {
        SWITCH_NAT_TYPE_NONE,

diff --git a/src/include/switch_stun.h b/src/include/switch_stun.h
index 75bc6469330fce6501626d56b0d45a92297a214a..d5df57e4fe5b170077c6250c2155b37505709e3f 100644 (file)
--- a/src/include/switch_stun.h
+++ b/src/include/switch_stun.h
@@ -34,8 +34,8 @@
   \ingroup core1
   \{
 */
-#ifndef _SWITCH_STUN_PARSER_H
-#define _SWITCH_STUN_PARSER_H
+#ifndef FREESWITCH_STUN_PARSER_H
+#define FREESWITCH_STUN_PARSER_H
 
 SWITCH_BEGIN_EXTERN_C
 #define SWITCH_STUN_DEFAULT_PORT 3478

diff --git a/src/include/switch_xml.h b/src/include/switch_xml.h
index 0443f96ba6d99673b89b118829b37b55c5cca931..9a3b72d6fa23dcfbb9dd801a194925b6285c9ce1 100644 (file)
--- a/src/include/switch_xml.h
+++ b/src/include/switch_xml.h
@@ -53,8 +53,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _SWITCH_XML_H
-#define _SWITCH_XML_H
+#ifndef FREESWITCH_XML_H
+#define FREESWITCH_XML_H
 #include <switch.h>
 
 

diff --git a/src/mod/applications/mod_expr/conio.h b/src/mod/applications/mod_expr/conio.h
index ec0540456f57df3a7b83d5e6e8cf9c8fe0b87e01..a83971fdd6065fb218baa4e08752ca4b7b058e56 100644 (file)
--- a/src/mod/applications/mod_expr/conio.h
+++ b/src/mod/applications/mod_expr/conio.h
@@ -8,8 +8,8 @@
  * Offered for use in the public domain without any warranty.
  */
 
-#ifndef _CONIO_H_
-#define _CONIO_H_
+#ifndef CONIO_H
+#define CONIO_H
 
 
 #include <stdio.h>

diff --git a/src/mod/applications/mod_t38gateway/udptl.h b/src/mod/applications/mod_t38gateway/udptl.h
index b0eb1b2e5aca59c39db1e3ea7c6106ff2a330b1c..39740353d11b33d40c7519386c67b540a16edfce 100644 (file)
--- a/src/mod/applications/mod_t38gateway/udptl.h
+++ b/src/mod/applications/mod_t38gateway/udptl.h
@@ -22,8 +22,8 @@
  *
  */
 
-#if !defined(_UDPTL_H_)
-#define _UDPTL_H_
+#if !defined(FREESWITCH_UDPTL_H)
+#define FREESWITCH_UDPTL_H
 
 #define LOCAL_FAX_MAX_DATAGRAM      400
 #define LOCAL_FAX_MAX_FEC_PACKETS   5

diff --git a/src/mod/endpoints/mod_portaudio/pablio.h b/src/mod/endpoints/mod_portaudio/pablio.h
index 675be61748982fd46d61fc8fea167c317e70cf63..0bd3c41e4635374bbe6e37fafa9af69bf0540d67 100644 (file)
--- a/src/mod/endpoints/mod_portaudio/pablio.h
+++ b/src/mod/endpoints/mod_portaudio/pablio.h
@@ -1,5 +1,5 @@
-#ifndef _PABLIO_H
-#define _PABLIO_H
+#ifndef PORTAUDIO_PABLIO_H
+#define PORTAUDIO_PABLIO_H
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/mod/xml_int/mod_xml_ldap/lutil_ldap.h b/src/mod/xml_int/mod_xml_ldap/lutil_ldap.h
index 48369013b4c2bab085d7abf8bf76d7e50bcf0643..181137cae65d33c4cc108218b84ee294d5fd4b5e 100644 (file)
--- a/src/mod/xml_int/mod_xml_ldap/lutil_ldap.h
+++ b/src/mod/xml_int/mod_xml_ldap/lutil_ldap.h
@@ -13,8 +13,8 @@
  * <http://www.OpenLDAP.org/license.html>.
  */
 
-#ifndef _LUTIL_LDAP_H
-#define _LUTIL_LDAP_H 1
+#ifndef LUTIL_LDAP_H
+#define LUTIL_LDAP_H
 
 #include <ldap_cdefs.h>
 #include <lber_types.h>