From add3ded40abb0ab0eed1f6580c2aaaff56722f11 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Mon, 26 Apr 2010 01:30:51 -0400
Subject: [PATCH] cleanup C reserved identifer violation (JANITOR-3)

---
 src/include/g711.h                          | 4 ++--
 src/include/switch_dso.h                    | 4 ++--
 src/include/switch_nat.h                    | 4 ++--
 src/include/switch_stun.h                   | 4 ++--
 src/include/switch_xml.h                    | 4 ++--
 src/mod/applications/mod_expr/conio.h       | 4 ++--
 src/mod/applications/mod_t38gateway/udptl.h | 4 ++--
 src/mod/endpoints/mod_portaudio/pablio.h    | 4 ++--
 src/mod/xml_int/mod_xml_ldap/lutil_ldap.h   | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/include/g711.h b/src/include/g711.h
index ec75e3967c..53f3afc87e 100644
--- 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 052cd5b5d3..a715e02cf1 100644
--- 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 87ba3190ff..ced175ba47 100644
--- 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 75bc646933..d5df57e4fe 100644
--- 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 0443f96ba6..9a3b72d6fa 100644
--- 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 ec0540456f..a83971fdd6 100644
--- 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 b0eb1b2e5a..39740353d1 100644
--- 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 675be61748..0bd3c41e46 100644
--- 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 48369013b4..181137cae6 100644
--- 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>