From 0f4b4c82de4cb8d663b2b566adf3c979c85e3e6d Mon Sep 17 00:00:00 2001
From: Sascha Schumann <sas@php.net>
Date: Tue, 20 May 2003 12:38:04 +0000
Subject: [PATCH] Fix use of ZEND_EXTERN_MODULE_GLOBALS which mysteriously
 includes a trailing semicolon.

Also add a do {} while (0) construct in php_session.h
---
 ext/com/php_COM.h         | 2 +-
 ext/ncurses/php_ncurses.h | 2 +-
 ext/session/mod_files.c   | 2 +-
 ext/session/php_session.h | 7 +++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ext/com/php_COM.h b/ext/com/php_COM.h
index 1b2b3b0316..5e9de9cd1d 100644
--- a/ext/com/php_COM.h
+++ b/ext/com/php_COM.h
@@ -58,7 +58,7 @@ ZEND_BEGIN_MODULE_GLOBALS(com)
 	int nothing;
 ZEND_END_MODULE_GLOBALS(com)
 
-PHPAPI ZEND_EXTERN_MODULE_GLOBALS(com);
+PHPAPI ZEND_EXTERN_MODULE_GLOBALS(com)
 	
 #ifdef ZTS
 #define COMG(v)	TSRMG(com_globals_id, zend_com_globals *, v)
diff --git a/ext/ncurses/php_ncurses.h b/ext/ncurses/php_ncurses.h
index 00592bd602..d8b9874582 100644
--- a/ext/ncurses/php_ncurses.h
+++ b/ext/ncurses/php_ncurses.h
@@ -66,7 +66,7 @@ ZEND_END_MODULE_GLOBALS(ncurses)
 #define NCURSES_LS_FETCH()
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(ncurses);
+ZEND_EXTERN_MODULE_GLOBALS(ncurses)
 	
 #endif  /* PHP_NCURSES_H */
 
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 8f235a92c9..bac61020ae 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -142,7 +142,7 @@ static void ps_files_open(ps_files *data, const char *key TSRMLS_DC)
 		ps_files_close(data);
 		
 		if (!ps_files_valid_key(key)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "The session id contains illegal characters, valid characters are only a-z, A-Z and 0-9");
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "The session id contains invalid characters, valid characters are only a-z, A-Z and 0-9");
 			return;
 		}
 		if (!ps_files_path_create(buf, sizeof(buf), data, key))
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index 18ce420ecc..2a81af05e3 100644
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -211,8 +211,7 @@ PHPAPI void php_session_start(TSRMLS_D);
 	ulong num_key;												\
 	zval **struc;
 
-#define PS_ENCODE_LOOP(code)										\
-	{																\
+#define PS_ENCODE_LOOP(code) do {										\
 		HashTable *_ht = Z_ARRVAL_P(PS(http_session_vars)); \
 																	\
 		for (zend_hash_internal_pointer_reset(_ht);			\
@@ -223,9 +222,9 @@ PHPAPI void php_session_start(TSRMLS_D);
 				code;		 										\
 			} 														\
 		}															\
-	}
+	} while(0)
 
-ZEND_EXTERN_MODULE_GLOBALS(ps);
+ZEND_EXTERN_MODULE_GLOBALS(ps)
 
 void php_session_auto_start(void *data);
 void php_session_shutdown(void *data);
-- 
2.50.1