r7441: Get rid of // comments. Tridge, if this breaks anything, please revert it. More tomorrow

Volker
(This used to be commit 02efa4427d80aa1e9a8f0275c568d977faa0f9b8)

5 files changed, 218 insertions, 228 deletions

diff --git a/source4/lib/ejs/config.h b/source4/lib/ejs/config.h
index ec350890df..cf75d48270 100644
--- a/source4/lib/ejs/config.h
+++ b/source4/lib/ejs/config.h
@@ -1,13 +1,3 @@
-//  
-//  config.h -- Build configuration file.
-//  
-//  WARNING: DO NOT EDIT. This file is generated by configure.
-//  
-//  If you wish to modify the defaults, then edit conf/config.defaults.* and
-//  then run "configure --reset".
-//  
-////////////////////////////////////////////////////////////////////////////////
-
 #define BLD_PRODUCT "Samba4"
 #define BLD_NAME "Samba4 SWAT"
 #define BLD_VERSION "4"
diff --git a/source4/lib/ejs/miniMpr.h b/source4/lib/ejs/miniMpr.h
index b74c734728..3bbd63a302 100644
--- a/source4/lib/ejs/miniMpr.h
+++ b/source4/lib/ejs/miniMpr.h
@@ -82,18 +82,18 @@ extern "C" {
 #endif
 
 #if BLD_FEATURE_SQUEEZE
-///
-///	Reasonable length of a file path name to use in most cases where you know
-///	the expected file name and it is certain to be less than this limit.
-///
+/*
+ *	Reasonable length of a file path name to use in most cases where you know
+ *	the expected file name and it is certain to be less than this limit.
+ */
 #define MPR_MAX_FNAME			128
 #define MPR_MAX_STRING			512
-#define MPR_DEFAULT_HASH_SIZE	23			// Default size of hash table index 
+#define MPR_DEFAULT_HASH_SIZE	23			/* Default size of hash table index  */
 #define MPR_MAX_HEAP_SIZE 		(32 * 1024)
 #else
 #define MPR_MAX_FNAME			256
 #define MPR_MAX_STRING			4096
-#define MPR_DEFAULT_HASH_SIZE	43			// Default size of hash table index 
+#define MPR_DEFAULT_HASH_SIZE	43			/* Default size of hash table index  */
 #define MPR_MAX_HEAP_SIZE 		(64 * 1024)
 #endif
 
@@ -109,74 +109,74 @@ extern "C" {
 	#define mprAssert(C)	if (1) ; else
 #endif
 
-///
-///	Standard MPR return and error codes 
-///
-#define MPR_ERR_BASE					(-200) 				///< Error code
-#define MPR_ERR_GENERAL					(MPR_ERR_BASE - 1)	///< Error code
-#define MPR_ERR_ABORTED					(MPR_ERR_BASE - 2)	///< Error code
-#define MPR_ERR_ALREADY_EXISTS			(MPR_ERR_BASE - 3)	///< Error code
-#define MPR_ERR_BAD_ARGS				(MPR_ERR_BASE - 4)	///< Error code
-#define MPR_ERR_BAD_FORMAT				(MPR_ERR_BASE - 5)	///< Error code
-#define MPR_ERR_BAD_HANDLE				(MPR_ERR_BASE - 6)	///< Error code
-#define MPR_ERR_BAD_STATE				(MPR_ERR_BASE - 7)	///< Error code
-#define MPR_ERR_BAD_SYNTAX				(MPR_ERR_BASE - 8)	///< Error code
-#define MPR_ERR_BAD_TYPE				(MPR_ERR_BASE - 9)	///< Error code
-#define MPR_ERR_BAD_VALUE				(MPR_ERR_BASE - 10)	///< Error code
-#define MPR_ERR_BUSY					(MPR_ERR_BASE - 11)	///< Error code
-#define MPR_ERR_CANT_ACCESS				(MPR_ERR_BASE - 12)	///< Error code
-#define MPR_ERR_CANT_COMPLETE			(MPR_ERR_BASE - 13)	///< Error code
-#define MPR_ERR_CANT_CREATE				(MPR_ERR_BASE - 14)	///< Error code
-#define MPR_ERR_CANT_INITIALIZE			(MPR_ERR_BASE - 15)	///< Error code
-#define MPR_ERR_CANT_OPEN				(MPR_ERR_BASE - 16)	///< Error code
-#define MPR_ERR_CANT_READ				(MPR_ERR_BASE - 17)	///< Error code
-#define MPR_ERR_CANT_WRITE				(MPR_ERR_BASE - 18)	///< Error code
-#define MPR_ERR_DELETED					(MPR_ERR_BASE - 19)	///< Error code
-#define MPR_ERR_NETWORK					(MPR_ERR_BASE - 20)	///< Error code
-#define MPR_ERR_NOT_FOUND				(MPR_ERR_BASE - 21)	///< Error code
-#define MPR_ERR_NOT_INITIALIZED			(MPR_ERR_BASE - 22)	///< Error code
-#define MPR_ERR_NOT_READY				(MPR_ERR_BASE - 23)	///< Error code
-#define MPR_ERR_READ_ONLY				(MPR_ERR_BASE - 24)	///< Error code
-#define MPR_ERR_TIMEOUT					(MPR_ERR_BASE - 25)	///< Error code
-#define MPR_ERR_TOO_MANY				(MPR_ERR_BASE - 26)	///< Error code
-#define MPR_ERR_WONT_FIT				(MPR_ERR_BASE - 27)	///< Error code
-#define MPR_ERR_WOULD_BLOCK				(MPR_ERR_BASE - 28)	///< Error code
-#define MPR_ERR_CANT_ALLOCATE			(MPR_ERR_BASE - 29)	///< Error code
-#define MPR_ERR_MAX						(MPR_ERR_BASE - 30)	///< Error code
-
-//
-//	Standard error severity and trace levels. These are ored with the error 
-//	severities below. The MPR_LOG_MASK is used to extract the trace level 
-//	from a flags word. We expect most apps to run with level 2 trace.
-//
-#define	MPR_FATAL		0				///< Fatal error. Cant continue.
-#define	MPR_ERROR		1				///< Hard error
-#define MPR_WARN		2				///< Soft warning
-#define	MPR_CONFIG		2				///< Essential configuration settings 
-#define MPR_INFO		3				///< Informational only 
-#define MPR_DEBUG		4				///< Debug information 
-#define MPR_VERBOSE		9				///< Highest level of trace 
-#define MPR_LOG_MASK	0xf				///< Level mask 
-
-//
-//	Error flags. Specify where the error should be sent to. Note that the 
-//	product.xml setting "headless" will modify how errors are reported.
-//	Assert errors are trapped when in DEV mode. Otherwise ignored.
-//
-#define	MPR_TRAP		0x10			///< Assert error -- trap in debugger 
-#define	MPR_LOG			0x20			///< Log the error in the O/S event log
-#define	MPR_USER		0x40			///< Display to the user 
-#define	MPR_ALERT		0x80			///< Send a management alert 
-#define	MPR_TRACE		0x100			///< Trace
-
-//
-//	Error format flags
-//
-#define MPR_RAW			0x200			// Raw trace output
-
-//
-//	Error line number information
-//
+/*
+ *	Standard MPR return and error codes
+ */
+#define MPR_ERR_BASE					(-200) 				/* Error code */
+#define MPR_ERR_GENERAL					(MPR_ERR_BASE - 1)	/* Error code */
+#define MPR_ERR_ABORTED					(MPR_ERR_BASE - 2)	/* Error code */
+#define MPR_ERR_ALREADY_EXISTS			(MPR_ERR_BASE - 3)	/* Error code */
+#define MPR_ERR_BAD_ARGS				(MPR_ERR_BASE - 4)	/* Error code */
+#define MPR_ERR_BAD_FORMAT				(MPR_ERR_BASE - 5)	/* Error code */
+#define MPR_ERR_BAD_HANDLE				(MPR_ERR_BASE - 6)	/* Error code */
+#define MPR_ERR_BAD_STATE				(MPR_ERR_BASE - 7)	/* Error code */
+#define MPR_ERR_BAD_SYNTAX				(MPR_ERR_BASE - 8)	/* Error code */
+#define MPR_ERR_BAD_TYPE				(MPR_ERR_BASE - 9)	/* Error code */
+#define MPR_ERR_BAD_VALUE				(MPR_ERR_BASE - 10)	/* Error code */
+#define MPR_ERR_BUSY					(MPR_ERR_BASE - 11)	/* Error code */
+#define MPR_ERR_CANT_ACCESS				(MPR_ERR_BASE - 12)	/* Error code */
+#define MPR_ERR_CANT_COMPLETE			(MPR_ERR_BASE - 13)	/* Error code */
+#define MPR_ERR_CANT_CREATE				(MPR_ERR_BASE - 14)	/* Error code */
+#define MPR_ERR_CANT_INITIALIZE			(MPR_ERR_BASE - 15)	/* Error code */
+#define MPR_ERR_CANT_OPEN				(MPR_ERR_BASE - 16)	/* Error code */
+#define MPR_ERR_CANT_READ				(MPR_ERR_BASE - 17)	/* Error code */
+#define MPR_ERR_CANT_WRITE				(MPR_ERR_BASE - 18)	/* Error code */
+#define MPR_ERR_DELETED					(MPR_ERR_BASE - 19)	/* Error code */
+#define MPR_ERR_NETWORK					(MPR_ERR_BASE - 20)	/* Error code */
+#define MPR_ERR_NOT_FOUND				(MPR_ERR_BASE - 21)	/* Error code */
+#define MPR_ERR_NOT_INITIALIZED			(MPR_ERR_BASE - 22)	/* Error code */
+#define MPR_ERR_NOT_READY				(MPR_ERR_BASE - 23)	/* Error code */
+#define MPR_ERR_READ_ONLY				(MPR_ERR_BASE - 24)	/* Error code */
+#define MPR_ERR_TIMEOUT					(MPR_ERR_BASE - 25)	/* Error code */
+#define MPR_ERR_TOO_MANY				(MPR_ERR_BASE - 26)	/* Error code */
+#define MPR_ERR_WONT_FIT				(MPR_ERR_BASE - 27)	/* Error code */
+#define MPR_ERR_WOULD_BLOCK				(MPR_ERR_BASE - 28)	/* Error code */
+#define MPR_ERR_CANT_ALLOCATE			(MPR_ERR_BASE - 29)	/* Error code */
+#define MPR_ERR_MAX						(MPR_ERR_BASE - 30)	/* Error code */
+
+/*
+ *	Standard error severity and trace levels. These are ored with the error
+ *	severities below. The MPR_LOG_MASK is used to extract the trace level
+ *	from a flags word. We expect most apps to run with level 2 trace.
+ */
+#define	MPR_FATAL		0				/* Fatal error. Cant continue. */
+#define	MPR_ERROR		1				/* Hard error */
+#define MPR_WARN		2				/* Soft warning */
+#define	MPR_CONFIG		2				/* Essential configuration settings  */
+#define MPR_INFO		3				/* Informational only  */
+#define MPR_DEBUG		4				/* Debug information  */
+#define MPR_VERBOSE		9				/* Highest level of trace  */
+#define MPR_LOG_MASK	0xf				/* Level mask  */
+
+/*
+ *	Error flags. Specify where the error should be sent to. Note that the
+ *	product.xml setting "headless" will modify how errors are reported.
+ *	Assert errors are trapped when in DEV mode. Otherwise ignored.
+ */
+#define	MPR_TRAP		0x10			/* Assert error -- trap in debugger  */
+#define	MPR_LOG			0x20			/* Log the error in the O/S event log */
+#define	MPR_USER		0x40			/* Display to the user  */
+#define	MPR_ALERT		0x80			/* Send a management alert  */
+#define	MPR_TRACE		0x100			/* Trace */
+
+/*
+ *	Error format flags
+ */
+#define MPR_RAW			0x200			/* Raw trace output */
+
+/*
+ *	Error line number information
+ */
 #define MPR_L		__FILE__, __LINE__
 
 typedef char*			MprStr;
@@ -242,7 +242,7 @@ typedef struct {
 	error(file, line, E_BLD_FEATURE_ASSERT, T("%s"), cond)
 
 #else /* !BLD_GOAHEAD_WEBSERVER */
-//#define mprMalloc malloc
+/* #define mprMalloc malloc */
 #define mprSprintf snprintf
 #define mtVsprintf vsnprintf
 extern void		*mprMalloc(uint size);
diff --git a/source4/lib/ejs/mprOs.h b/source4/lib/ejs/mprOs.h
index c88a3e3c43..6a6d0b4205 100644
--- a/source4/lib/ejs/mprOs.h
+++ b/source4/lib/ejs/mprOs.h
@@ -1,39 +1,39 @@
-///
-///	@file 	mprOs.h
-/// @brief 	Include O/S headers and smooth out per-O/S differences
-//	@copy	default
-//	
-//	Copyright (c) Mbedthis Software LLC, 2003-2005. All Rights Reserved.
-//	
-//	This software is distributed under commercial and open source licenses.
-//	You may use the GPL open source license described below or you may acquire 
-//	a commercial license from Mbedthis Software. You agree to be fully bound 
-//	by the terms of either license. Consult the LICENSE.TXT distributed with 
-//	this software for full details.
-//	
-//	This software is open source; you can redistribute it and/or modify it 
-//	under the terms of the GNU General Public License as published by the 
-//	Free Software Foundation; either version 2 of the License, or (at your 
-//	option) any later version. See the GNU General Public License for more 
-//	details at: http://www.mbedthis.com/downloads/gplLicense.html
-//	
-//	This program is distributed WITHOUT ANY WARRANTY; without even the 
-//	implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-//	
-//	This GPL license does NOT permit incorporating this software into 
-//	proprietary programs. If you are unable to comply with the GPL, you must
-//	acquire a commercial license to use this software. Commercial licenses 
-//	for this software and support services are available from Mbedthis 
-//	Software at http://www.mbedthis.com 
-//	
-//	@end
-//////////////////////////////// Documentation /////////////////////////////////
-///
-///	This header is part of the Mbedthis Portable Runtime and aims to include
-///	all necessary O/S headers and to unify the constants and declarations 
-///	required by Mbedthis products. It can be included by C or C++ programs.
-///
-////////////////////////////////////////////////////////////////////////////////
+/*
+ *	@file 	mprOs.h
+ *  @brief 	Include O/S headers and smooth out per-O/S differences
+ *	@copy	default
+ *	
+ *	Copyright (c) Mbedthis Software LLC, 2003-2005. All Rights Reserved.
+ *	
+ *	This software is distributed under commercial and open source licenses.
+ *	You may use the GPL open source license described below or you may acquire 
+ *	a commercial license from Mbedthis Software. You agree to be fully bound 
+ *	by the terms of either license. Consult the LICENSE.TXT distributed with 
+ *	this software for full details.
+ *	
+ *	This software is open source; you can redistribute it and/or modify it 
+ *	under the terms of the GNU General Public License as published by the 
+ *	Free Software Foundation; either version 2 of the License, or (at your 
+ *	option) any later version. See the GNU General Public License for more 
+ *	details at: http://www.mbedthis.com/downloads/gplLicense.html
+ *	
+ *	This program is distributed WITHOUT ANY WARRANTY; without even the 
+ *	implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ *	
+ *	This GPL license does NOT permit incorporating this software into 
+ *	proprietary programs. If you are unable to comply with the GPL, you must
+ *	acquire a commercial license to use this software. Commercial licenses 
+ *	for this software and support services are available from Mbedthis 
+ *	Software at http://www.mbedthis.com 
+ *	
+ *	@end
+ ******************************* Documentation *********************************
+ *
+ *	This header is part of the Mbedthis Portable Runtime and aims to include
+ *	all necessary O/S headers and to unify the constants and declarations
+ *	required by Mbedthis products. It can be included by C or C++ programs.
+ *
+ ********************************************************************************/
 
 #error foo
 
@@ -44,10 +44,10 @@ blah blah;
 
 #include	"lib/ejs/config.h"
 
-////////////////////////////////// CPU Families ////////////////////////////////
-//
-//	Porters, add your CPU families here and update configure code. 
-//
+/********************************* CPU Families *********************************/
+/*
+ *	Porters, add your CPU families here and update configure code.
+ */
 #define MPR_CPU_UNKNOWN		0
 #define MPR_CPU_IX86		1
 #define MPR_CPU_PPC 		2
@@ -56,10 +56,10 @@ blah blah;
 #define MPR_CPU_ARM 		5
 #define MPR_CPU_MIPS 		6
 #define MPR_CPU_68K 		7
-#define MPR_CPU_SIMNT 		8			//	VxWorks NT simulator
-#define MPR_CPU_SIMSPARC 	9			//	VxWorks sparc simulator
+#define MPR_CPU_SIMNT 		8			/*	VxWorks NT simulator */
+#define MPR_CPU_SIMSPARC 	9			/*	VxWorks sparc simulator */
 
-////////////////////////////////// O/S Includes ////////////////////////////////
+/********************************* O/S Includes *********************************/
 
 #if LINUX || SOLARIS
 	#include	<sys/types.h>
@@ -114,7 +114,7 @@ blah blah;
 	#include	<values.h>
 #endif
 
-#endif // LINUX || SOLARIS
+#endif /* LINUX || SOLARIS */
 
 #if VXWORKS
 	#include	<vxWorks.h>
@@ -162,7 +162,7 @@ blah blah;
 	#include	<tickLib.h>
 	#include	<taskHookLib.h>
 
-#endif // VXWORKS
+#endif /* VXWORKS */
 
 #if MACOSX
 	#include	<time.h>
@@ -205,7 +205,7 @@ blah blah;
 	#include	<sys/utsname.h>
 	#include	<sys/wait.h>
 	#include	<unistd.h>
-#endif // MACOSX
+#endif /* MACOSX */
 
 #if WIN
 	#include	<ctype.h>
@@ -235,15 +235,15 @@ blah blah;
 	#include	<shlobj.h>
 	#include	<shellapi.h>
 	#include	<wincrypt.h>
-#endif // WIN 
+#endif /* WIN  */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////// General Defines ///////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
+/********************************************************************************/
+/******************************* General Defines ********************************/
+/********************************************************************************/
 
 #define	MAXINT			INT_MAX
 #define BITS(type)		(BITSPERBYTE * (int) sizeof(type))
@@ -256,21 +256,21 @@ extern "C" {
 #define min(a,b)  (((a) < (b)) ? (a) : (b))
 #endif
 
-//
-//	Set FD_SETSIZE to the maximum number of files (sockets) that you want to
-//	support. It is used in select.cpp.
-//
-//	#ifdef FD_SETSIZE
-//		#undef FD_SETSIZE
-//	#endif
-//	#define FD_SETSIZE		128
-//
+/*
+ *	Set FD_SETSIZE to the maximum number of files (sockets) that you want to
+ *	support. It is used in select.cpp.
+ *
+ *	#ifdef FD_SETSIZE
+ *		#undef FD_SETSIZE
+ *	#endif
+ *	#define FD_SETSIZE		128
+ */
 
-typedef char	*MprStr;					// Used for dynamic strings
+typedef char	*MprStr;					/* Used for dynamic strings */
 
-////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////// Linux Defines ////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
+/********************************************************************************/
+/*******************************/ Linux Defines *********************************/
+/********************************************************************************/
 
 #if LINUX
 	typedef unsigned char uchar;
@@ -294,10 +294,10 @@ typedef char	*MprStr;					// Used for dynamic strings
 #endif
 
 	#if BLD_FEATURE_MALLOC
-		//
-		//	PORTERS: You will need add assembler code for your architecture here
-		//	only if you want to use the fast malloc (BLD_FEATURE_MALLOC)
-		//
+	/*
+	 *	PORTERS: You will need add assembler code for your architecture here
+	 *	only if you want to use the fast malloc (BLD_FEATURE_MALLOC)
+	 */
 		#if UNUSED
 			#define MPR_GET_RETURN(ip)	__builtin_return_address(0)
 		#else
@@ -307,16 +307,16 @@ typedef char	*MprStr;					// Used for dynamic strings
 						"=g" (ip) : \
 						: "eax")
 			#endif
-		#endif // UNUSED
-	#endif // BLD_FEATURE_MALLOC
+#endif /* UNUSED */
+#endif /* BLD_FEATURE_MALLOC */
 
 #if FUTURE
-//	#define mprGetHiResTime(x) __asm__ __volatile__ ("rdtsc" : "=A" (x))
-//	extern char *inet_ntoa_r(const struct in_addr in, char *buffer, int buflen);
+/*	#define mprGetHiResTime(x) __asm__ __volatile__ ("rdtsc" : "=A" (x)) */
+/*	extern char *inet_ntoa_r(const struct in_addr in, char *buffer, int buflen); */
 
-	//
-	//	Atomic functions
-	//
+	/* */
+	/*	Atomic functions */
+	/* */
 	typedef struct { volatile int counter; } mprAtomic_t;
 
 	#if BLD_FEATURE_MULTITHREAD
@@ -338,13 +338,13 @@ typedef char	*MprStr;					// Used for dynamic strings
 			:"=m" (v->counter)
 			:"m" (v->counter));
 	}
-#endif	// FUTURE
+#endif	/* FUTURE */
 
-#endif 	// LINUX 
+#endif 	/* LINUX  */
 
-////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////// VxWorks Defines ///////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
+/********************************************************************************/
+/******************************* VxWorks Defines ********************************/
+/********************************************************************************/
 
 #if VXWORKS
 
@@ -389,10 +389,10 @@ typedef char	*MprStr;					// Used for dynamic strings
 	extern int sysClkRateGet();
 
 	#if BLD_FEATURE_MALLOC
-		//
-		//	PORTERS: You will need add assembler code for your architecture here
-		//	only if you want to use the fast malloc (BLD_FEATURE_MALLOC)
-		//
+	/*
+	 *	PORTERS: You will need add assembler code for your architecture here
+	 *	only if you want to use the fast malloc (BLD_FEATURE_MALLOC)
+	 */
 		#if UNUSED
 			#define MPR_GET_RETURN(ip)	__builtin_return_address(0)
 		#else
@@ -402,13 +402,13 @@ typedef char	*MprStr;					// Used for dynamic strings
 						"=g" (ip) : \
 						: "eax")
 			#endif
-		#endif // UNUSED
-	#endif // BLD_FEATURE_MALLOC
-#endif 	// VXWORKS 
+#endif /* UNUSED */
+#endif /* BLD_FEATURE_MALLOC */
+#endif 	/* VXWORKS  */
 
-////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////// MacOsx Defines ///////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
+/********************************************************************************/
+/******************************** MacOsx Defines ********************************/
+/********************************************************************************/
 #if MACOSX
 	typedef unsigned long ulong;
 	typedef unsigned char uchar;
@@ -434,20 +434,20 @@ typedef char	*MprStr;					// Used for dynamic strings
 #endif
 
 	#if MPR_FEATURE_MALLOC
-	//
-	//	PORTERS: You will need add assembler code for your architecture here
-	//	only if you want to use the fast malloc (MPR_FEATURE_MALLOC)
-	//
+	/*
+	 *	PORTERS: You will need add assembler code for your architecture here
+	 *	only if you want to use the fast malloc (MPR_FEATURE_MALLOC)
+	 */
 	#define MPR_GET_RETURN(ip)	__builtin_return_address
 	#endif
 
 #if FUTURE
-//	#define mprGetHiResTime(x) __asm__ __volatile__ ("rdtsc" : "=A" (x))
-//	extern char *inet_ntoa_r(const struct in_addr in, char *buffer, int buflen);
+/*	#define mprGetHiResTime(x) __asm__ __volatile__ ("rdtsc" : "=A" (x)) */
+/*	extern char *inet_ntoa_r(const struct in_addr in, char *buffer, int buflen); */
 
-	//
-	//	Atomic functions
-	//
+	/* */
+	/*	Atomic functions */
+	/* */
 	typedef struct { volatile int counter; } mprAtomic_t;
 
 	#if MPR_FEATURE_MULTITHREAD
@@ -470,11 +470,11 @@ typedef char	*MprStr;					// Used for dynamic strings
 			:"m" (v->counter));
 	}
 #endif
-#endif // MACOSX
+#endif /* MACOSX */
 
-////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////// Windows Defines ///////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
+/********************************************************************************/
+/******************************* Windows Defines ********************************/
+/********************************************************************************/
 
 #if WIN
 	typedef unsigned char uchar;
@@ -555,10 +555,10 @@ typedef char	*MprStr;					// Used for dynamic strings
 	#define rmdir(a) 	_rmdir(a)
 
 	#if BLD_FEATURE_MALLOC
-	//
-	//	PORTERS: You will need add assembler code for your architecture here
-	//	only if you want to use the fast malloc (BLD_FEATURE_MALLOC)
-	//
+	/*
+	 *	PORTERS: You will need add assembler code for your architecture here
+	 *	only if you want to use the fast malloc (BLD_FEATURE_MALLOC)
+	 */
 	#if MPR_CPU_IX86
 	#define MPR_GET_RETURN(ip) \
 		__asm {	mov	eax, 4[ebp] } \
@@ -576,11 +576,11 @@ typedef char	*MprStr;					// Used for dynamic strings
 	extern uid_t 	getuid(void);
 	extern uid_t 	geteuid(void);
 
-#endif // WIN 
+#endif /* WIN  */
 
-////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////// Solaris Defines ////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
+/********************************************************************************/
+/*****************************/ Solaris Defines *********************************/
+/********************************************************************************/
 
 #if SOLARIS
 	typedef unsigned char uchar;
@@ -607,21 +607,21 @@ typedef char	*MprStr;					// Used for dynamic strings
 	#define MAX_FLOAT		MAXFLOAT
 #endif
 
-#endif // SOLARIS 
+#endif /* SOLARIS  */
 
-////////////////////////////////////////////////////////////////////////////////
+/********************************************************************************/
 #ifdef __cplusplus
 }
 #endif
 
-#endif // _h_MPR_OS_HDRS 
-
-//
-// Local variables:
-// tab-width: 4
-// c-basic-offset: 4
-// End:
-// vim:tw=78
-// vim600: sw=4 ts=4 fdm=marker
-// vim<600: sw=4 ts=4
-//
+#endif /* _h_MPR_OS_HDRS  */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim:tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/source4/lib/ejs/var.c b/source4/lib/ejs/var.c
index 5df306797d..ce771caa04 100644
--- a/source4/lib/ejs/var.c
+++ b/source4/lib/ejs/var.c
@@ -376,7 +376,7 @@ MprVar *mprCreateProperty(MprVar *obj, const char *propertyName, MprVar *newValu
 	}
 
 	if (prop) {
-		//	FUTURE -- remove. Just for debug.
+		/* 	FUTURE -- remove. Just for debug. */
 		mprAssert(prop == 0);
 		mprLog(0, "Attempting to create property %s in object %s\n",
 			propertyName, obj->name);
@@ -1589,7 +1589,7 @@ void mprVarToString(char** out, int size, char *fmt, MprVar *obj)
 
 	switch (obj->type) {
 	case MPR_TYPE_UNDEFINED:
-		//	FUTURE -- spec says convert to "undefined"
+		/*	FUTURE -- spec says convert to "undefined" */
 		*out = mprStrdup("");
 		break;
 
@@ -1650,7 +1650,7 @@ void mprVarToString(char** out, int size, char *fmt, MprVar *obj)
 		break;
 
 	case MPR_TYPE_OBJECT:
-		//	FUTURE -- really want: [object class: name] 
+		/*	FUTURE -- really want: [object class: name] */
 		mprAllocSprintf(out, size, "[object %s]", obj->name);
 		break;
 
@@ -2127,7 +2127,7 @@ bool mprIsNan(double f)
 #if WIN
 	return _isnan(f);
 #elif VXWORKS
-	//	FUTURE
+	/*	FUTURE */
 	return (0);
 #else
 	return (f == FP_NAN);
@@ -2140,14 +2140,14 @@ bool mprIsInfinite(double f)
 #if WIN
 	return !_finite(f);
 #elif VXWORKS
-	//	FUTURE
+	/*	FUTURE */
 	return (0);
 #else
 	return (f == FP_INFINITE);
 #endif
 }
 
-#endif // BLD_FEATURE_FLOATING_POINT
+#endif /* BLD_FEATURE_FLOATING_POINT */
 /******************************************************************************/
 
 /*
diff --git a/source4/lib/ejs/var.h b/source4/lib/ejs/var.h
index 1f9ab65aa7..3cb23cf461 100644
--- a/source4/lib/ejs/var.h
+++ b/source4/lib/ejs/var.h
@@ -81,17 +81,17 @@ struct MprVar;
  *	do compile time conditional compilation on BLD_FEATURE_NUM_TYPE_ID.
  */
 typedef int MprType;
-#define MPR_TYPE_UNDEFINED 			0 	///< Undefined. No value has been set.
-#define MPR_TYPE_NULL 				1	///< Value defined to be null.
-#define MPR_TYPE_BOOL 				2	///< Boolean type.
-#define MPR_TYPE_CFUNCTION 			3	///< C function or C++ method
-#define MPR_TYPE_FLOAT 				4	///< Floating point number
-#define MPR_TYPE_INT 				5	///< Integer number
-#define MPR_TYPE_INT64 				6	///< 64-bit Integer number
-#define MPR_TYPE_OBJECT 			7	///< Object reference
-#define MPR_TYPE_FUNCTION 			8	///< JavaScript function
-#define MPR_TYPE_STRING 			9	///< String (immutable)
-#define MPR_TYPE_STRING_CFUNCTION 	10	///< C/C++ function with string args
+#define MPR_TYPE_UNDEFINED 			0 	/* Undefined. No value has been set. */
+#define MPR_TYPE_NULL 				1	/* Value defined to be null. */
+#define MPR_TYPE_BOOL 				2	/* Boolean type. */
+#define MPR_TYPE_CFUNCTION 			3	/* C function or C++ method */
+#define MPR_TYPE_FLOAT 				4	/* Floating point number */
+#define MPR_TYPE_INT 				5	/* Integer number */
+#define MPR_TYPE_INT64 				6	/* 64-bit Integer number */
+#define MPR_TYPE_OBJECT 			7	/* Object reference */
+#define MPR_TYPE_FUNCTION 			8	/* JavaScript function */
+#define MPR_TYPE_STRING 			9	/* String (immutable) */
+#define MPR_TYPE_STRING_CFUNCTION 	10	/* C/C++ function with string args */
 
 /*
  *	Create a type for the default number type
@@ -324,15 +324,15 @@ typedef struct MprVar {
  *	Define a field macro so code an use numbers in a "generic" fashion.
  */
 #if MPR_NUM_VAR == MPR_TYPE_INT || DOXYGEN
-//*	Default numeric type */
+/*	Default numeric type */
 #define mprNumber integer
 #endif
 #if MPR_NUM_VAR == MPR_TYPE_INT64
-//*	Default numeric type */
+/*	Default numeric type */
 #define mprNumber integer64
 #endif
 #if MPR_NUM_VAR == MPR_TYPE_FLOAT
-//*	Default numeric type */
+/*	Default numeric type */
 #define mprNumber floating
 #endif