Rename macros which begin with underscore to appropiate macros. The general

rule is:

	macro_name=`echo $filename|tr a-z A-Z|sed 's/\./_/'`

13 files changed, 36 insertions, 36 deletions

diff --git a/ext/standard/base64.h b/ext/standard/base64.h
index 0352b4ab36..d65e882e45 100644
--- a/ext/standard/base64.h
+++ b/ext/standard/base64.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _BASE64_h
-#define _BASE64_h
+#ifndef BASE64_H
+#define BASE64_H
 
 PHP_FUNCTION(base64_decode);
 PHP_FUNCTION(base64_encode);
@@ -37,7 +37,7 @@ PHP_FUNCTION(base64_encode);
 extern unsigned char *php_base64_encode(const unsigned char *, int, int *);
 extern unsigned char *php_base64_decode(const unsigned char *, int, int *);
 
-#endif /* _BASE64_h */
+#endif /* BASE64_H */
 
 /*
  * Local variables:
diff --git a/ext/standard/md5.h b/ext/standard/md5.h
index 86bb4f7ada..451b49431d 100644
--- a/ext/standard/md5.h
+++ b/ext/standard/md5.h
@@ -26,8 +26,8 @@
    | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
    +----------------------------------------------------------------------+
  */
-#ifndef _md5_h
-#define _md5_h
+#ifndef MD5_H
+#define MD5_H
 /* MD5.H - header file for MD5C.C
  */
 
diff --git a/ext/standard/pageinfo.h b/ext/standard/pageinfo.h
index 5f230fec05..3c0a3a1e45 100644
--- a/ext/standard/pageinfo.h
+++ b/ext/standard/pageinfo.h
@@ -1,5 +1,5 @@
-#ifndef _PROCESS_H
-#define _PROCESS_H
+#ifndef PAGEINFO_H
+#define PAGEINFO_H
 
 PHP_FUNCTION(getmyuid);
 PHP_FUNCTION(getmypid);
diff --git a/ext/standard/php_filestat.h b/ext/standard/php_filestat.h
index 580351f0b1..9391a27ada 100644
--- a/ext/standard/php_filestat.h
+++ b/ext/standard/php_filestat.h
@@ -29,8 +29,8 @@
 
 /* $Id$ */
 
-#ifndef _FILESTAT_H
-#define _FILESTAT_H
+#ifndef PHP_FILESTAT_H
+#define PHP_FILESTAT_H
 
 PHP_RINIT_FUNCTION(filestat);
 PHP_RSHUTDOWN_FUNCTION(filestat);
@@ -61,4 +61,4 @@ PHP_FUNCTION(chmod);
 PHP_FUNCTION(touch);
 PHP_FUNCTION(clearstatcache);
 
-#endif /* _FILESTAT_H */
+#endif /* PHP_FILESTAT_H */
diff --git a/ext/standard/php_image.h b/ext/standard/php_image.h
index d2fb431c0e..bc2c9d4ac5 100644
--- a/ext/standard/php_image.h
+++ b/ext/standard/php_image.h
@@ -18,9 +18,9 @@
 
 /* $Id$ */
 
-#ifndef _IMAGE_H
-#define _IMAGE_H
+#ifndef PHP_IMAGE_H
+#define PHP_IMAGE_H
 
 PHP_FUNCTION(getimagesize);
 
-#endif /* _IMAGE_H */
+#endif /* PHP_IMAGE_H */
diff --git a/ext/standard/php_iptc.h b/ext/standard/php_iptc.h
index 2abc43dae1..6eb7c8bdd3 100644
--- a/ext/standard/php_iptc.h
+++ b/ext/standard/php_iptc.h
@@ -30,10 +30,10 @@
 
 /* $Id$ */
 
-#ifndef _PHPIPTC_H
-#define _PHPIPTC_H
+#ifndef PHP_IPTC_H
+#define PHP_IPTC_H
 
 PHP_FUNCTION(iptcparse);
 PHP_FUNCTION(iptcembed);
 
-#endif /* _PHPIPTC_H */
+#endif /* PHP_IPTC_H */
diff --git a/ext/standard/php_mail.h b/ext/standard/php_mail.h
index d2e33a7ed9..43277a1ee2 100644
--- a/ext/standard/php_mail.h
+++ b/ext/standard/php_mail.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _MAIL_H
-#define _MAIL_H
+#ifndef PHP_MAIL_H
+#define PHP_MAIL_H
 
 #if HAVE_SENDMAIL
 
@@ -42,4 +42,4 @@ extern int php_mail(char *to, char *subject, char *message, char *headers);
 
 #endif
 
-#endif /* _MAIL_H */
+#endif /* PHP_MAIL_H */
diff --git a/ext/standard/php_math.h b/ext/standard/php_math.h
index e4127322c3..4f6fb3ce9c 100644
--- a/ext/standard/php_math.h
+++ b/ext/standard/php_math.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHPMATH_H
-#define _PHPMATH_H
+#ifndef PHP_MATH_H
+#define PHP_MATH_H
 PHP_FUNCTION(sin);
 PHP_FUNCTION(cos);
 PHP_FUNCTION(tan);
@@ -121,4 +121,4 @@ PHP_FUNCTION(rad2deg);
 #define M_SQRT1_2      0.70710678118654752440  /* 1/sqrt(2) */
 #endif
 
-#endif /* _PHPMATH_H */
+#endif /* PHP_MATH_H */
diff --git a/ext/standard/php_metaphone.h b/ext/standard/php_metaphone.h
index a8ccf98ba4..348988c288 100644
--- a/ext/standard/php_metaphone.h
+++ b/ext/standard/php_metaphone.h
@@ -18,8 +18,8 @@
  
 /* $Id$ */
 
-#ifndef _php_metaphone_h
-#define _php_metaphone_h
+#ifndef PHP_METAPHONE_H
+#define PHP_METAPHONE_H
 
 PHP_FUNCTION(metaphone);
 
diff --git a/ext/standard/php_output.h b/ext/standard/php_output.h
index 1b747e7641..556647a821 100644
--- a/ext/standard/php_output.h
+++ b/ext/standard/php_output.h
@@ -17,8 +17,8 @@
 */
 
 
-#ifndef _OUTPUT_BUFFER
-#define _OUTPUT_BUFFER
+#ifndef PHP_OUTPUT_H
+#define PHP_OUTPUT_H
 
 #include "php.h"
 
@@ -69,4 +69,4 @@ ZEND_API extern php_output_globals output_globals;
 #endif
 
 
-#endif /* _OUTPUT_BUFFER */
+#endif /* PHP_OUTPUT_H */
diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index 983d098ca3..b387faa72c 100644
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -33,8 +33,8 @@
 
 /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
 
-#ifndef _PHPSTRING_H
-#define _PHPSTRING_H
+#ifndef PHP_STRING_H
+#define PHP_STRING_H
 
 PHP_FUNCTION(strspn);
 PHP_FUNCTION(strcspn);
@@ -123,4 +123,4 @@ PHPAPI char *php_strerror(int errnum);
 #define strerror php_strerror
 #endif
 
-#endif /* _PHPSTRING_H */
+#endif /* PHP_STRING_H */
diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h
index ee90af462d..01fe63ec88 100644
--- a/ext/standard/php_var.h
+++ b/ext/standard/php_var.h
@@ -28,8 +28,8 @@
  */
 
 
-#ifndef _PHPVAR_H
-#define _PHPVAR_H
+#ifndef PHP_VAR_H
+#define PHP_VAR_H
 
 PHP_FUNCTION(var_dump);
 PHP_FUNCTION(serialize);
@@ -41,4 +41,4 @@ int php_var_unserialize(pval **rval, const char **p, const char *max);
 
 PHPAPI zend_class_entry *php_create_empty_class(char *class_name,int len);
 
-#endif /* _PHPVAR_H */
+#endif /* PHP_VAR_H */
diff --git a/ext/standard/scanf.h b/ext/standard/scanf.h
index d95545d8c8..712b975d12 100644
--- a/ext/standard/scanf.h
+++ b/ext/standard/scanf.h
@@ -15,8 +15,8 @@
    | Authors: clayton collie <clcollie@mindspring.com>                    |
    +----------------------------------------------------------------------+
  */
-#ifndef  _SCAN_H_
-#define  _SCAN_H_
+#ifndef  SCANF_H
+#define  SCANF_H
 
 
 #define SCAN_MAX_ARGS   0xFF    /* Maximum number of variable which can be      */
@@ -45,4 +45,4 @@ PHPAPI int php_sscanf_internal(char *string,char *format,int argCount,zval ***ar
 inline void scan_set_error_return(int numVars,pval **return_value);
 
 
-#endif /* ifndef _SCAN_PHP_ */
+#endif /* SCANF_H */