C++ comments transformed to C comments.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2004-03-09 22:48:53 +00:00
parent 60848fcfef
commit b6db2e9107
3 changed files with 18 additions and 18 deletions

View File

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

View File

@ -75,9 +75,9 @@ protected:
virtual void EventLoop_Install_Callback(GSocketEvent event) = 0; virtual void EventLoop_Install_Callback(GSocketEvent event) = 0;
virtual void EventLoop_Uninstall_Callback(GSocketEvent event) = 0; virtual void EventLoop_Uninstall_Callback(GSocketEvent event) = 0;
public: public:
//DFE: We can't protect these data member until the GUI code is updated /* DFE: We can't protect these data member until the GUI code is updated */
//protected: /* protected: */
#else //def wxUSE_GSOCKET_CPLUSPLUS #else /* def wxUSE_GSOCKET_CPLUSPLUS */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -85,7 +85,7 @@ extern "C" {
/* Definition of GSocket */ /* Definition of GSocket */
struct _GSocket struct _GSocket
{ {
#endif //def wxUSE_GSOCKET_CPLUSPLUS #endif /* def wxUSE_GSOCKET_CPLUSPLUS */
int m_fd; int m_fd;
GAddress *m_local; GAddress *m_local;
GAddress *m_peer; GAddress *m_peer;
@ -113,8 +113,8 @@ struct _GSocket
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#else #else
/////////////////////////////////////////////////////////////////////////// /**************************************************************************/
// GSocketBSDGUIShim /* GSocketBSDGUIShim */
class GSocketBSDGUIShim:public GSocketBSD class GSocketBSDGUIShim:public GSocketBSD
{ {
friend void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc); friend void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc);
@ -136,7 +136,7 @@ private:
static struct GSocketGUIFunctionsTable *ms_gui_functions; static struct GSocketGUIFunctionsTable *ms_gui_functions;
}; };
#endif //ndef wxUSE_GSOCKET_CPLUSPLUS #endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -156,7 +156,7 @@ struct _GAddress
} }
#endif /* __cplusplus */ #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 #ifdef wxUSE_GSOCKET_CPLUSPLUS
inline void GSocket_Shutdown(GSocket *socket) inline void GSocket_Shutdown(GSocket *socket)
{ socket->Shutdown(); } { socket->Shutdown(); }
@ -192,7 +192,7 @@ inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
inline void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags) inline void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
{ socket->UnsetCallback(flags); } { socket->UnsetCallback(flags); }
#endif //def wxUSE_GSOCKET_CPLUSPLUS #endif /* def wxUSE_GSOCKET_CPLUSPLUS */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -226,7 +226,7 @@ void _GSocket_Disable(GSocket *socket, GSocketEvent event);
#ifndef wxUSE_GSOCKET_CPLUSPLUS #ifndef wxUSE_GSOCKET_CPLUSPLUS
void _GSocket_Detected_Read(GSocket *socket); void _GSocket_Detected_Read(GSocket *socket);
void _GSocket_Detected_Write(GSocket *socket); void _GSocket_Detected_Write(GSocket *socket);
#endif //ndef wxUSE_GSOCKET_CPLUSPLUS #endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
/* GAddress */ /* GAddress */

View File

@ -261,7 +261,7 @@ GSocket *GSocket_new(void)
void GSocket_close(GSocket *socket) void GSocket_close(GSocket *socket)
{ {
_GSocket_Disable_Events(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__))) #if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))
close(socket->m_fd); close(socket->m_fd);
#endif #endif
@ -1616,7 +1616,7 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
{ {
#else #else
/* Use gethostbyname by default */ /* 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) if (val)
{ {
#endif #endif