Applied patch [ 1306443 ] Removal of C++-style comments from C files

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

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 049bda136227236a7ee0fc99c4baa097c9508c11..3019e028eebc966a3be5a27d8259e57a3a206794 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -71,7 +71,7 @@
 
 #    undef wxUSE_STACKWALKER
 #    define wxUSE_STACKWALKER 0
 
 #    undef wxUSE_STACKWALKER
 #    define wxUSE_STACKWALKER 0

-#endif // compiler doesn't support SEH
+#endif /* compiler doesn't support SEH */

 
 /* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior */
 #if defined(__MWERKS__)
 
 /* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior */
 #if defined(__MWERKS__)

diff --git a/include/wx/platform.h b/include/wx/platform.h
index aa6c716c03370a3bf2c3950eaafbfd189a7b3353..731bcc61871c764e5366054e24e2a133488bdaef 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -235,7 +235,7 @@
 #endif /* wxUSE_UNICODE */
 
 #if defined( __MWERKS__ ) && !defined(__INTEL__)
 #endif /* wxUSE_UNICODE */
 
 #if defined( __MWERKS__ ) && !defined(__INTEL__)

-// otherwise MSL headers bring in WIN32 dependant APIs
+/* otherwise MSL headers bring in WIN32 dependant APIs */

 #undef UNICODE
 #endif
 
 #undef UNICODE
 #endif
 

diff --git a/setup.h.in b/setup.h.in
index 6e58cdf1f3af90a89ee374314e6097b505d6b551..e28be0bee126ebb9ec025a785b72acb81387131c 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1064,8 +1064,9 @@
    with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 
    with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 

-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
+/* Set to 0 to disable PostScript print/preview architecture code under Windows
+  (just use Windows printing).
+ */

 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 #endif /* __WIN32__ */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 #endif /* __WIN32__ */

diff --git a/src/common/extended.c b/src/common/extended.c
index b3e2bd8cd690f2c805e97e7031fb5b9a9a73fcf3..53cf1db8b50345fce967bda3f7ba538ad25ddde8 100644 (file)
--- a/src/common/extended.c
+++ b/src/common/extended.c
@@ -9,7 +9,7 @@
 
 
 #if defined(_WIN32_WCE)
 
 
 #if defined(_WIN32_WCE)

-    // eVC cause warnings in its own headers: stdlib.h and winnt.h
+    /* eVC cause warnings in its own headers: stdlib.h and winnt.h */

     #pragma warning (disable:4115)
     #pragma warning (disable:4214)
 #endif
     #pragma warning (disable:4115)
     #pragma warning (disable:4214)
 #endif