from the non-ANSI comment police (was: it won't compile on win32)

Message-Id: <20011229203646.24CF.H.M.BRAND@hccnet.nl>      

(NetWare tree not touched because it's very //)

p4raw-id: //depot/perl@13939

21 files changed, 107 insertions, 107 deletions

diff --git a/XSUB.h b/XSUB.h
index e05b369588..a6dfdc4c6c 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -281,7 +281,7 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #    undef ungetc
 #    undef fileno
 
-//Following symbols were giving redefinition errors while building extensions - sgp 17th Oct 2000
+/* Following symbols were giving redefinition errors while building extensions - sgp 17th Oct 2000 */
 #ifdef NETWARE
 #	undef readdir
 #	undef fstat
diff --git a/os2/os2.c b/os2/os2.c
index 655e613a92..830d900163 100644
--- a/os2/os2.c
+++ b/os2/os2.c
@@ -2744,21 +2744,21 @@ my_flock(int handle, int o)
   if (!(_emx_env & 0x200) || !use_my) 
     return flock(handle, o);	/* Delegate to EMX. */
   
-                                        // is this a file?
+                                        /* is this a file? */
   if ((DosQueryHType(handle, &handle_type, &flag_word) != 0) ||
       (handle_type & 0xFF))
   {
     errno = EBADF;
     return -1;
   }
-                                        // set lock/unlock ranges
+                                        /* set lock/unlock ranges */
   rNull.lOffset = rNull.lRange = rFull.lOffset = 0;
   rFull.lRange = 0x7FFFFFFF;
-                                        // set timeout for blocking
+                                        /* set timeout for blocking */
   timeout = ((blocking = !(o & LOCK_NB))) ? 100 : 1;
-                                        // shared or exclusive?
+                                        /* shared or exclusive? */
   shared = (o & LOCK_SH) ? 1 : 0;
-                                        // do not block the unlock
+                                        /* do not block the unlock */
   if (o & (LOCK_UN | LOCK_SH | LOCK_EX)) {
     rc = DosSetFileLocks(handle, &rFull, &rNull, timeout, shared);
     switch (rc) {
@@ -2772,7 +2772,7 @@ my_flock(int handle, int o)
         errno = ENOLCK;
         return -1;
       case ERROR_LOCK_VIOLATION:
-        break;                          // not an error
+        break;                          /* not an error */
       case ERROR_INVALID_PARAMETER:
       case ERROR_ATOMIC_LOCK_NOT_SUPPORTED:
       case ERROR_READ_LOCKS_NOT_SUPPORTED:
@@ -2786,9 +2786,9 @@ my_flock(int handle, int o)
         return -1;
     }
   }
-                                        // lock may block
+                                        /* lock may block */
   if (o & (LOCK_SH | LOCK_EX)) {
-                                        // for blocking operations
+                                        /* for blocking operations */
     for (;;) {
       rc =
         DosSetFileLocks(
@@ -2826,7 +2826,7 @@ my_flock(int handle, int o)
           errno = EINVAL;
           return -1;
       }
-                                        // give away timeslice
+                                        /* give away timeslice */
       DosSleep(1);
     }
   }
@@ -2880,7 +2880,7 @@ my_getpwent (void)
   if (!use_my_pwent())
     return getpwent();			/* Delegate to EMX. */
   if (pwent_cnt++)
-    return 0;				// Return one entry only
+    return 0;				/* Return one entry only */
   return getpwuid(0);
 }
 
@@ -2901,7 +2901,7 @@ struct group *
 getgrent (void)
 {
   if (grent_cnt++)
-    return 0;				// Return one entry only
+    return 0;				/* Return one entry only */
   return getgrgid(0);
 }
 
diff --git a/perl.h b/perl.h
index 87f52785ca..89e0a126e5 100644
--- a/perl.h
+++ b/perl.h
@@ -254,7 +254,7 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
 
 #if defined(HASVOLATILE) || defined(STANDARD_C)
 #   ifdef __cplusplus
-#	define VOL		// to temporarily suppress warnings
+#	define VOL		/* to temporarily suppress warnings */
 #   else
 #	define VOL volatile
 #   endif
diff --git a/win32/include/netdb.h b/win32/include/netdb.h
index b0c5ea1949..43c03c7544 100644
--- a/win32/include/netdb.h
+++ b/win32/include/netdb.h
@@ -1,7 +1,7 @@
-// netdb.h
+/* netdb.h */
 
-// djl
-// Provide UNIX compatibility
+/* djl */
+/* Provide UNIX compatibility */
 
 
 #ifndef  _INC_NETDB
@@ -9,4 +9,4 @@
 
 #include <sys/socket.h>
 
-#endif //_INC_NETDB
+#endif /* _INC_NETDB */
diff --git a/win32/include/sys/socket.h b/win32/include/sys/socket.h
index d1f1de6b6a..0f71ad855a 100644
--- a/win32/include/sys/socket.h
+++ b/win32/include/sys/socket.h
@@ -1,7 +1,7 @@
-// sys/socket.h
+/* sys/socket.h */
 
-// djl
-// Provide UNIX compatibility
+/* djl */
+/* Provide UNIX compatibility */
 
 #ifndef  _INC_SYS_SOCKET
 #define  _INC_SYS_SOCKET
@@ -109,9 +109,9 @@ void win32_endprotoent(void);
 void win32_endservent(void);
 
 #ifndef WIN32SCK_IS_STDSCK
-//
-// direct to our version
-//
+
+/* direct to our version */
+
 #define htonl		win32_htonl
 #define htons		win32_htons
 #define ntohl		win32_ntohl
@@ -176,4 +176,4 @@ void win32_endservent(void);
 }
 #endif
 
-#endif	// _INC_SYS_SOCKET
+#endif	/* _INC_SYS_SOCKET */
diff --git a/win32/perlhost.h b/win32/perlhost.h
index 9493a73187..475158fce5 100644
--- a/win32/perlhost.h
+++ b/win32/perlhost.h
@@ -210,7 +210,7 @@ protected:
 
     DWORD   m_dwEnvCount;
     LPSTR*  m_lppEnvList;
-    BOOL    m_bTopLevel;	// is this a toplevel host?
+    BOOL    m_bTopLevel;	/* is this a toplevel host? */
     static long num_hosts;
 public:
     inline  int LastHost(void) { return num_hosts == 1L; };
@@ -2051,7 +2051,7 @@ CPerlHost::CPerlHost(CPerlHost& host)
 
 CPerlHost::~CPerlHost(void)
 {
-//  Reset();
+/* Reset(); */
     InterlockedDecrement(&num_hosts);
     delete m_pvDir;
     m_pVMemParse->Release();
@@ -2078,7 +2078,7 @@ CPerlHost::Find(LPCSTR lpStr)
 
 int
 lookup(const void *arg1, const void *arg2)
-{   // Compare strings
+{   /* Compare strings */
     char*ptr1, *ptr2;
     char c1,c2;
 
@@ -2091,18 +2091,18 @@ lookup(const void *arg1, const void *arg2)
 	    if(c2 == '\0' || c2 == '=')
 		break;
 
-	    return -1; // string 1 < string 2
+	    return -1; /* string 1 < string 2 */
 	}
 	else if(c2 == '\0' || c2 == '=')
-	    return 1; // string 1 > string 2
+	    return 1; /* string 1 > string 2 */
 	else if(c1 != c2) {
 	    c1 = toupper(c1);
 	    c2 = toupper(c2);
 	    if(c1 != c2) {
 		if(c1 < c2)
-		    return -1; // string 1 < string 2
+		    return -1; /* string 1 < string 2 */
 
-		return 1; // string 1 > string 2
+		return 1; /* string 1 > string 2 */
 	    }
 	}
     }
@@ -2117,7 +2117,7 @@ CPerlHost::Lookup(LPCSTR lpStr)
 
 int
 compare(const void *arg1, const void *arg2)
-{   // Compare strings
+{   /* Compare strings */
     char*ptr1, *ptr2;
     char c1,c2;
 
@@ -2130,18 +2130,18 @@ compare(const void *arg1, const void *arg2)
 	    if(c1 == c2)
 		break;
 
-	    return -1; // string 1 < string 2
+	    return -1; /* string 1 < string 2 */
 	}
 	else if(c2 == '\0' || c2 == '=')
-	    return 1; // string 1 > string 2
+	    return 1; /* string 1 > string 2 */
 	else if(c1 != c2) {
 	    c1 = toupper(c1);
 	    c2 = toupper(c2);
 	    if(c1 != c2) {
 		if(c1 < c2)
-		    return -1; // string 1 < string 2
+		    return -1; /* string 1 < string 2 */
 	
-		return 1; // string 1 > string 2
+		return 1; /* string 1 > string 2 */
 	    }
 	}
     }
@@ -2161,7 +2161,7 @@ CPerlHost::Add(LPCSTR lpStr)
 
     szBuffer[index] = '\0';
 
-    // replacing ?
+    /* replacing ? */
     lpPtr = Lookup(szBuffer);
     if(lpPtr != NULL) {
 	Renew(*lpPtr, length, char);
@@ -2231,45 +2231,45 @@ CPerlHost::CreateLocalEnvironmentStrings(VDir &vDir)
     DWORD dwSize, dwEnvIndex;
     int nLength, compVal;
 
-    // get the process environment strings
+    /* get the process environment strings */
     lpAllocPtr = lpTmp = (LPSTR)GetEnvironmentStrings();
 
-    // step over current directory stuff
+    /* step over current directory stuff */
     while(*lpTmp == '=')
 	lpTmp += strlen(lpTmp) + 1;
 
-    // save the start of the environment strings
+    /* save the start of the environment strings */
     lpEnvPtr = lpTmp;
     for(dwSize = 1; *lpTmp != '\0'; lpTmp += strlen(lpTmp) + 1) {
-	// calculate the size of the environment strings
+	/* calculate the size of the environment strings */
 	dwSize += strlen(lpTmp) + 1;
     }
 
-    // add the size of current directories
+    /* add the size of current directories */
     dwSize += vDir.CalculateEnvironmentSpace();
 
-    // add the additional space used by changes made to the environment
+    /* add the additional space used by changes made to the environment */
     dwSize += CalculateEnvironmentSpace();
 
     New(1, lpStr, dwSize, char);
     lpPtr = lpStr;
     if(lpStr != NULL) {
-	// build the local environment
+	/* build the local environment */
 	lpStr = vDir.BuildEnvironmentSpace(lpStr);
 
 	dwEnvIndex = 0;
 	lpLocalEnv = GetIndex(dwEnvIndex);
 	while(*lpEnvPtr != '\0') {
 	    if(!lpLocalEnv) {
-		// all environment overrides have been added
-		// so copy string into place
+		/* all environment overrides have been added */
+		/* so copy string into place */
 		strcpy(lpStr, lpEnvPtr);
 		nLength = strlen(lpEnvPtr) + 1;
 		lpStr += nLength;
 		lpEnvPtr += nLength;
 	    }
 	    else {	
-		// determine which string to copy next
+		/* determine which string to copy next */
 		compVal = compare(&lpEnvPtr, &lpLocalEnv);
 		if(compVal < 0) {
 		    strcpy(lpStr, lpEnvPtr);
@@ -2285,7 +2285,7 @@ CPerlHost::CreateLocalEnvironmentStrings(VDir &vDir)
 		    }
 		    lpLocalEnv = GetIndex(dwEnvIndex);
 		    if(compVal == 0) {
-			// this string was replaced
+			/* this string was replaced */
 			lpEnvPtr += strlen(lpEnvPtr) + 1;
 		    }
 		}
@@ -2293,8 +2293,8 @@ CPerlHost::CreateLocalEnvironmentStrings(VDir &vDir)
 	}
 
 	while(lpLocalEnv) {
-	    // still have environment overrides to add
-	    // so copy the strings into place if not an override
+	    /* still have environment overrides to add */
+	    /* so copy the strings into place if not an override */
 	    char *ptr = strchr(lpLocalEnv, '=');
 	    if(ptr && ptr[1]) {
 		strcpy(lpStr, lpLocalEnv);
@@ -2303,11 +2303,11 @@ CPerlHost::CreateLocalEnvironmentStrings(VDir &vDir)
 	    lpLocalEnv = GetIndex(dwEnvIndex);
 	}
 
-	// add final NULL
+	/* add final NULL */
 	*lpStr = '\0';
     }
 
-    // release the process environment strings
+    /* release the process environment strings */
     FreeEnvironmentStrings(lpAllocPtr);
 
     return lpPtr;
diff --git a/win32/vmem.h b/win32/vmem.h
index a0e5eba070..2727b5cb7e 100644
--- a/win32/vmem.h
+++ b/win32/vmem.h
@@ -134,21 +134,21 @@ protected:
     void* Expand(void* block, size_t size);
     void WalkHeap(void);
 
-    HANDLE		m_hHeap;		    // memory heap for this script
-    char		m_FreeDummy[minAllocSize];  // dummy free block
-    PBLOCK		m_pFreeList;		    // pointer to first block on free list
-    PBLOCK		m_pRover;		    // roving pointer into the free list
-    HeapRec		m_heaps[maxHeaps];	    // list of all non-contiguous heap areas 
-    int			m_nHeaps;		    // no. of heaps in m_heaps 
-    long		m_lAllocSize;		    // current alloc size
-    long		m_lRefCount;		    // number of current users
-    CRITICAL_SECTION	m_cs;			    // access lock
+    HANDLE		m_hHeap;		    /* memory heap for this script */
+    char		m_FreeDummy[minAllocSize];  /* dummy free block */
+    PBLOCK		m_pFreeList;		    /* pointer to first block on free list */
+    PBLOCK		m_pRover;		    /* roving pointer into the free list */
+    HeapRec		m_heaps[maxHeaps];	    /* list of all non-contiguous heap areas  */
+    int			m_nHeaps;		    /* no. of heaps in m_heaps  */
+    long		m_lAllocSize;		    /* current alloc size */
+    long		m_lRefCount;		    /* number of current users */
+    CRITICAL_SECTION	m_cs;			    /* access lock */
 #ifdef _DEBUG_MEM
     FILE*		m_pLog;
 #endif
 };
 
-// #define _DEBUG_MEM
+/* #define _DEBUG_MEM */
 #ifdef _DEBUG_MEM
 #define ASSERT(f) if(!(f)) DebugBreak();
 
diff --git a/wince/include/errno.h b/wince/include/errno.h
index 4dba2d89d9..592816fbe2 100644
--- a/wince/include/errno.h
+++ b/wince/include/errno.h
@@ -24,7 +24,7 @@ extern int errno;
 #define ENOMEM          12
 #define EACCES          13
 #define EFAULT          14
-#define EOSERR          15 // rk
+#define EOSERR          15 /* rk */
 #define EBUSY           16
 #define EEXIST          17
 #define EXDEV           18
diff --git a/wince/include/netdb.h b/wince/include/netdb.h
index b0c5ea1949..43c03c7544 100644
--- a/wince/include/netdb.h
+++ b/wince/include/netdb.h
@@ -1,7 +1,7 @@
-// netdb.h
+/* netdb.h */
 
-// djl
-// Provide UNIX compatibility
+/* djl */
+/* Provide UNIX compatibility */
 
 
 #ifndef  _INC_NETDB
@@ -9,4 +9,4 @@
 
 #include <sys/socket.h>
 
-#endif //_INC_NETDB
+#endif /* _INC_NETDB */
diff --git a/wince/include/sys/socket.h b/wince/include/sys/socket.h
index 2d6f7b8306..fbc6e098db 100644
--- a/wince/include/sys/socket.h
+++ b/wince/include/sys/socket.h
@@ -1,7 +1,7 @@
-// sys/socket.h
+/* sys/socket.h */
 
-// djl
-// Provide UNIX compatibility
+/* djl */
+/* Provide UNIX compatibility */
 
 #ifndef  _INC_SYS_SOCKET
 #define  _INC_SYS_SOCKET
@@ -51,10 +51,10 @@ typedef struct _OVERLAPPED {
 #endif
 
 #endif
-#endif //_WINDOWS_
-// #ifndef __GNUC__
+#endif /* _WINDOWS_ */
+/* #ifndef __GNUC__ */
 #include <winsock.h>
-// #endif
+/* #endif */
 
 #define  ENOTSOCK	WSAENOTSOCK
 #undef   HOST_NOT_FOUND
@@ -147,9 +147,9 @@ void win32_endprotoent(void);
 void win32_endservent(void);
 
 #ifndef WIN32SCK_IS_STDSCK
-//
-// direct to our version
-//
+
+/* direct to our version */
+
 #define htonl		win32_htonl
 #define htons		win32_htons
 #define ntohl		win32_ntohl
@@ -214,4 +214,4 @@ void win32_endservent(void);
 }
 #endif
 
-#endif	// _INC_SYS_SOCKET
+#endif	/* _INC_SYS_SOCKET */
diff --git a/wince/include/sys/stat.h b/wince/include/sys/stat.h
index 7a5e383fc9..2f5c6348d5 100644
--- a/wince/include/sys/stat.h
+++ b/wince/include/sys/stat.h
@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 
-// stat.h
+/* stat.h */
 #define _S_IFMT         0170000         /* file type mask */
 #define _S_IFDIR        0040000         /* directory */
 #define _S_IFCHR        0020000         /* character special */
diff --git a/wince/perllib.c b/wince/perllib.c
index 3d4d37e500..527103f086 100644
--- a/wince/perllib.c
+++ b/wince/perllib.c
@@ -1,4 +1,4 @@
-// Time-stamp: <01/08/01 20:58:55 keuchel@w2k>
+/* Time-stamp: <01/08/01 20:58:55 keuchel@w2k> */
 
 #include "EXTERN.h"
 #include "perl.h"
diff --git a/wince/perlmain.c b/wince/perlmain.c
index 86e6c95524..cebbfb3d0f 100644
--- a/wince/perlmain.c
+++ b/wince/perlmain.c
@@ -1,4 +1,4 @@
-// Time-stamp: <01/08/01 20:58:19 keuchel@w2k>
+/* Time-stamp: <01/08/01 20:58:19 keuchel@w2k> */
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -14,7 +14,7 @@ int _CRT_glob = 0;
 
 #endif
 
-// Called from w32console/wmain.c
+/* Called from w32console/wmain.c */
 
 int
 main(int argc, char **argv, char **env)
diff --git a/wince/win32.h b/wince/win32.h
index c9c3a037f1..b46fb2f76a 100644
--- a/wince/win32.h
+++ b/wince/win32.h
@@ -1,4 +1,4 @@
-// Time-stamp: <01/08/01 20:59:54 keuchel@w2k>
+/* Time-stamp: <01/08/01 20:59:54 keuchel@w2k> */
 
 /* WIN32.H
  *
@@ -116,7 +116,7 @@ struct utsname {
 /* Define USE_SOCKETS_AS_HANDLES to enable emulation of windows sockets as
  * real filehandles. XXX Should always be defined (the other version is untested) */
 
-//#define USE_SOCKETS_AS_HANDLES
+/* #define USE_SOCKETS_AS_HANDLES */
 
 /* read() and write() aren't transparent for socket handles */
 #define PERL_SOCK_SYSREAD_IS_RECV
diff --git a/wince/win32iop.h b/wince/win32iop.h
index 3744168a96..020f2387fa 100644
--- a/wince/win32iop.h
+++ b/wince/win32iop.h
@@ -1,4 +1,4 @@
-// Time-stamp: <01/08/01 21:00:16 keuchel@w2k>
+/* Time-stamp: <01/08/01 21:00:16 keuchel@w2k> */
 
 #ifndef WIN32IOP_H
 #define WIN32IOP_H
diff --git a/wince/win32thread.c b/wince/win32thread.c
index a94ffa4234..4675822c66 100644
--- a/wince/win32thread.c
+++ b/wince/win32thread.c
@@ -1,4 +1,4 @@
-// Time-stamp: <01/08/01 21:00:29 keuchel@w2k>
+/* Time-stamp: <01/08/01 21:00:29 keuchel@w2k> */
 
 #include "EXTERN.h"
 #include "perl.h"
diff --git a/wince/win32thread.h b/wince/win32thread.h
index adae6180e7..33e11a5c64 100644
--- a/wince/win32thread.h
+++ b/wince/win32thread.h
@@ -1,4 +1,4 @@
-// Time-stamp: <01/08/01 21:00:36 keuchel@w2k>
+/* Time-stamp: <01/08/01 21:00:36 keuchel@w2k> */
 
 #ifndef _WIN32THREAD_H
 #define _WIN32THREAD_H
diff --git a/wince/wince.c b/wince/wince.c
index c1375817b8..b6b9f140db 100644
--- a/wince/wince.c
+++ b/wince/wince.c
@@ -871,8 +871,8 @@ win32_fseek(FILE *pf,long offset,int origin)
   return fseek(pf, offset, origin);
 }
 
-// fpos_t seems to be int64 on hpc pro! Really stupid.
-// But maybe someday there will be such large disks in a hpc...
+/* fpos_t seems to be int64 on hpc pro! Really stupid. */
+/* But maybe someday there will be such large disks in a hpc... */
 DllExport int
 win32_fgetpos(FILE *pf, fpos_t *p)
 {
@@ -1233,7 +1233,7 @@ win32_dynaload(const char* filename)
     return hModule;
 }
 
-// this is needed by Cwd.pm...
+/* this is needed by Cwd.pm... */
 
 static
 XS(w32_GetCwd)
@@ -1293,7 +1293,7 @@ XS(w32_GetOSVersion)
     XPUSHs(newSViv(osver.dwMajorVersion));
     XPUSHs(newSViv(osver.dwMinorVersion));
     XPUSHs(newSViv(osver.dwBuildNumber));
-    // WINCE = 3
+    /* WINCE = 3 */
     XPUSHs(newSViv(osver.dwPlatformId));
     PUTBACK;
 }
@@ -1560,12 +1560,12 @@ wce_hitreturn()
   return;
 }
 
-//////////////////////////////////////////////////////////////////////
+/* //////////////////////////////////////////////////////////////////// */
 
 void
 win32_argv2utf8(int argc, char** argv)
 {
-  // do nothing...
+  /* do nothing... */
 }
 
 void
@@ -1600,7 +1600,7 @@ Perl_sys_intern_clear(pTHX)
 #  endif
 }
 
-//////////////////////////////////////////////////////////////////////
+/* //////////////////////////////////////////////////////////////////// */
 
 #undef getcwd
 
diff --git a/wince/wince.h b/wince/wince.h
index dec518b280..29ec27472b 100644
--- a/wince/wince.h
+++ b/wince/wince.h
@@ -1,17 +1,17 @@
-// wince.h
-// 
-// Time-stamp: <01/08/01 20:48:08 keuchel@w2k>
+/* wince.h */
 
-// This file includes extracts from the celib-headers, because
-// the celib-headers produces macro conflicts with defines in
-// win32iop.h etc
+/* Time-stamp: <01/08/01 20:48:08 keuchel@w2k> */
+
+/* This file includes extracts from the celib-headers, because */
+/* the celib-headers produces macro conflicts with defines in */
+/* win32iop.h etc */
 
 #ifndef WINCE_H
 #define WINCE_H 1
 
 #include "celib_defs.h"
 
-// include local copies of celib headers...
+/* include local copies of celib headers... */
 #include "errno.h"
 #include "sys/stat.h"
 #include "time.h"
@@ -38,7 +38,7 @@ XCE_EXPORT void XCEShowMessageA(const char *fmt, ...);
 #define gmtime xcegmtime
 #define localtime xcelocaltime
 #define asctime xceasctime
-//#define utime xceutime
+/* #define utime xceutime */
 #define futime xcefutime
 #define ftime xceftime
 #define ctime xcectime
@@ -113,7 +113,7 @@ XCE_EXPORT DWORD XCEAPI XCEGetModuleFileNameA(HMODULE hModule, LPTSTR lpName, DW
 XCE_EXPORT HMODULE XCEAPI XCEGetModuleHandleA(const char *lpName);
 XCE_EXPORT FARPROC XCEAPI XCEGetProcAddressA(HMODULE hMod, const char *name);
 
-//////////////////////////////////////////////////////////////////////
+/* //////////////////////////////////////////////////////////////////// */
 
 #define getgid  xcegetgid
 #define getegid xcegetegid
diff --git a/wince/wincesck.c b/wince/wincesck.c
index beb7489e4f..003a250dd6 100644
--- a/wince/wincesck.c
+++ b/wince/wincesck.c
@@ -1,4 +1,4 @@
-// Time-stamp: <01/08/01 21:01:12 keuchel@w2k>
+/* Time-stamp: <01/08/01 21:01:12 keuchel@w2k> */
 
 /* wincesck.c
  *
@@ -10,7 +10,7 @@
  *    License or the Artistic License, as specified in the README file.
  */
 
-// The socket calls use fd functions from celib...
+/* The socket calls use fd functions from celib... */
 
 #define WIN32IO_IS_STDIO
 #define WIN32SCK_IS_STDSCK
@@ -50,7 +50,7 @@ XCE_EXPORT struct protoent *xcegetprotobynumber(int number);
 #define getprotobyname xcegetprotobyname
 #define getprotobynumber xcegetprotobynumber
 
-// uses fdtab...
+/* uses fdtab... */
 #include "cesocket2.h"
 
 #endif
@@ -234,7 +234,7 @@ win32_select(int nfds, Perl_fd_set* rd, Perl_fd_set* wr,
 	     Perl_fd_set* ex, const struct timeval* timeout)
 {
   StartSockets();
-  // select not yet fixed
+  /* select not yet fixed */
   errno = ENOSYS;
   return -1;
 }
diff --git a/x2p/a2py.c b/x2p/a2py.c
index cd396a28de..1b14fddd83 100644
--- a/x2p/a2py.c
+++ b/x2p/a2py.c
@@ -59,7 +59,7 @@ main(register int argc, register char **argv, register char **env)
     STR *tmpstr;
 
 	#ifdef NETWARE
-		fnInitGpfGlobals();	// For importing the CLIB calls in place of Watcom calls
+		fnInitGpfGlobals();	/* For importing the CLIB calls in place of Watcom calls */
 	#endif	/* NETWARE */
 
     myname = argv[0];