C++ comments transformed to C comments.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index a729d84769dbd790192a19b6f45bcc1b9fe1dceb..857cc04c53afead0486cf1adc919f9094ba71bb7 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -23,7 +23,7 @@
 #include "wx/setup.h"
 #include "wx/platform.h"
 
-#include "wx/dlimpexp.h" // for WXDLLIMPEXP_NET
+#include "wx/dlimpexp.h" /* for WXDLLIMPEXP_NET */
 
 #endif
 
@@ -46,7 +46,7 @@
 
 #ifdef wxUSE_GSOCKET_CPLUSPLUS
 typedef class GSocketBSD GSocket;
-#endif //def wxUSE_GSOCKET_CPLUSPLUS
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,7 +54,7 @@ extern "C" {
 
 #ifndef wxUSE_GSOCKET_CPLUSPLUS
 typedef struct _GSocket GSocket;
-#endif //ndef wxUSE_GSOCKET_CPLUSPLUS
+#endif
 typedef struct _GAddress GAddress;
 
 typedef enum {
@@ -286,7 +286,7 @@ void GSocket_SetNonBlocking(GSocket *socket, int non_block);
  */
 void GSocket_SetTimeout(GSocket *socket, unsigned long millisec);
 
-#endif //ndef wxUSE_GSOCKET_CPLUSPLUS
+#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
 
 /* GSocket_GetError:
  *  Returns the last error occured for this socket. Note that successful
@@ -336,7 +336,7 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
  */
 void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags);
 
-#endif //ndef wxUSE_GSOCKET_CPLUSPLUS
+#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
 
 
 /* GAddress */
@@ -377,7 +377,7 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf);
 
 #ifdef wxUSE_GSOCKET_CPLUSPLUS
 #include "wx/unix/gsockunx.h"
-#endif // def wxUSE_GSOCKET_CPLUSPLUS
+#endif
 
 #endif    /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
 

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index 8603d4290ba7ff70f89b9893132d4270d87f8fa6..2eba13f4ef3f61e033bd317bc1d8c9216553b76e 100644 (file)
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -75,9 +75,9 @@ protected:
     virtual void EventLoop_Install_Callback(GSocketEvent event) = 0;
     virtual void EventLoop_Uninstall_Callback(GSocketEvent event) = 0;
 public:
-//DFE: We can't protect these data member until the GUI code is updated
-//protected:
-#else //def wxUSE_GSOCKET_CPLUSPLUS
+    /* DFE: We can't protect these data member until the GUI code is updated */
+    /* protected: */
+#else /* def wxUSE_GSOCKET_CPLUSPLUS */
 
 #ifdef __cplusplus
 extern "C" {
@@ -85,7 +85,7 @@ extern "C" {
 /* Definition of GSocket */
 struct _GSocket
 {
-#endif //def wxUSE_GSOCKET_CPLUSPLUS
+#endif /* def wxUSE_GSOCKET_CPLUSPLUS */
   int m_fd;
   GAddress *m_local;
   GAddress *m_peer;
@@ -113,8 +113,8 @@ struct _GSocket
 }
 #endif  /* __cplusplus */
 #else
-///////////////////////////////////////////////////////////////////////////
-// GSocketBSDGUIShim
+/**************************************************************************/
+/* GSocketBSDGUIShim */
 class GSocketBSDGUIShim:public GSocketBSD
 {
     friend void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc);
@@ -136,7 +136,7 @@ private:
     static struct GSocketGUIFunctionsTable *ms_gui_functions;
 };
 
-#endif //ndef wxUSE_GSOCKET_CPLUSPLUS
+#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
 
 #ifdef __cplusplus
 extern "C" {
@@ -156,7 +156,7 @@ struct _GAddress
 }
 #endif  /* __cplusplus */
 
-// Compatibility methods to support old C API (from gsocket.h)
+/* Compatibility methods to support old C API (from gsocket.h) */
 #ifdef wxUSE_GSOCKET_CPLUSPLUS
 inline void GSocket_Shutdown(GSocket *socket)
 {   socket->Shutdown(); }
@@ -192,7 +192,7 @@ inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
 inline void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
 {   socket->UnsetCallback(flags); }
 
-#endif //def wxUSE_GSOCKET_CPLUSPLUS
+#endif /* def wxUSE_GSOCKET_CPLUSPLUS */
 
 #ifdef __cplusplus
 extern "C" {
@@ -226,7 +226,7 @@ void _GSocket_Disable(GSocket *socket, GSocketEvent event);
 #ifndef wxUSE_GSOCKET_CPLUSPLUS
 void _GSocket_Detected_Read(GSocket *socket);
 void _GSocket_Detected_Write(GSocket *socket);
-#endif //ndef wxUSE_GSOCKET_CPLUSPLUS
+#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
 
 /* GAddress */
 

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index dc6c7e570204b4003710cab36a86d44267200401..1b8f5b0e52ac4d2c836d8402de337d59e092814e 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -261,7 +261,7 @@ GSocket *GSocket_new(void)
 void GSocket_close(GSocket *socket)
 {
     _GSocket_Disable_Events(socket);
-// gsockosx.c calls CFSocketInvalidate which closes the socket for us
+    /* gsockosx.c calls CFSocketInvalidate which closes the socket for us */
 #if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))
     close(socket->m_fd);
 #endif
@@ -1616,7 +1616,7 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   {
 #else
   /* Use gethostbyname by default */
-  int val = 1;  //VA doesn't like constants in conditional expressions at all
+  int val = 1;  /* VA doesn't like constants in conditional expressions */
   if (val)
   {
 #endif