From: Václav Slavík <vslavik@fastmail.fm>
Date: Mon, 25 Jun 2007 15:07:20 +0000 (+0000)
Subject: don't use C++ comments in C files
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/28efe6544f28ba7b37a77c033901fdd6f3978b82

don't use C++ comments in C files

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

diff --git a/include/wx/chartype.h b/include/wx/chartype.h
index a9e2dee892..a326f0691c 100644
--- a/include/wx/chartype.h
+++ b/include/wx/chartype.h
@@ -190,7 +190,7 @@
 /* depending on the platform, Unicode build can either store wxStrings as
    wchar_t* or UTF-8 encoded char*: */
 #if wxUSE_UNICODE
-    // FIXME-UTF8: what would be better place for this?
+    /* FIXME-UTF8: what would be better place for this? */
     #if defined(wxUSE_UTF8_LOCALE_ONLY) && !defined(wxUSE_UNICODE_UTF8)
         #error "wxUSE_UTF8_LOCALE_ONLY only makes sense with wxUSE_UNICODE_UTF8"
     #endif
diff --git a/include/wx/cpp.h b/include/wx/cpp.h
index 77a907f3ac..7e9a436049 100644
--- a/include/wx/cpp.h
+++ b/include/wx/cpp.h
@@ -53,5 +53,5 @@
  */
 #define wxEMPTY_PARAMETER_VALUE /* Fake macro parameter value */
 
-#endif // _WX_CPP_H_
+#endif /* _WX_CPP_H_ */
 
diff --git a/include/wx/debug.h b/include/wx/debug.h
index b5854654c3..7cdaecf9c4 100644
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -129,7 +129,7 @@
                                           const char *szFunc,
                                           const char *szCond,
                                           const wxChar *szMsg);
-#endif // wxUSE_UNICODE
+#endif /* wxUSE_UNICODE */
 
   class WXDLLIMPEXP_BASE wxString;
   class WXDLLIMPEXP_BASE wxCStrData;
diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index b00c977038..6e8d2e815b 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -264,8 +264,8 @@
     #if wxUSE_ACTIVEX
         #undef wxUSE_ACTIVEX
         #define wxUSE_ACTIVEX 0
-    #endif // wxUSE_ACTIVEX
-#endif // __WINE__
+    #endif /* wxUSE_ACTIVEX */
+#endif /* __WINE__ */
 
 
 /* check settings consistency for MSW-specific ones */
diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index 0e0a0dfced..e9f28d43cc 100644
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -107,19 +107,19 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 
 #ifdef __cplusplus
     #if wxUSE_UNICODE_UTF8
-        // flag indicating whether the current locale uses UTF-8 or not; must be
-        // updated every time the locale is changed!
+        /* flag indicating whether the current locale uses UTF-8 or not; must be
+           updated every time the locale is changed! */
         #if wxUSE_UTF8_LOCALE_ONLY
         #define wxLocaleIsUtf8 true
         #else
         extern WXDLLIMPEXP_BASE bool wxLocaleIsUtf8;
         #endif
-        // function used to update the flag:
+        /* function used to update the flag: */
         extern WXDLLIMPEXP_BASE void wxUpdateLocaleIsUtf8();
-    #else // !wxUSE_UNICODE_UTF8
+    #else /* !wxUSE_UNICODE_UTF8 */
         inline void wxUpdateLocaleIsUtf8() {}
-    #endif // wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8
-#endif // __cplusplus
+    #endif /* wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8 */
+#endif /* __cplusplus */
 
 
 /* -------------------------------------------------------------------------
@@ -392,14 +392,14 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha
 
 /* these functions are only needed in the form used for filenames (i.e. char*
    on Unix, wchar_t* on Windows), so we don't need to use A/W suffix: */
-#if wxMBFILES || !wxUSE_UNICODE // ANSI filenames
+#if wxMBFILES || !wxUSE_UNICODE /* ANSI filenames */
 
     #define wxCRT_Fopen   fopen
     #define wxCRT_Freopen freopen
     #define wxCRT_Remove  remove
     #define wxCRT_Rename  rename
 
-#else // Unicode filenames
+#else /* Unicode filenames */
 
     /* special case: these functions are missing under Win9x with Unicows so we
        have to implement them ourselves */
@@ -426,7 +426,7 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha
         #endif
     #endif
 
-#endif // wxMBFILES/!wxMBFILES
+#endif /* wxMBFILES/!wxMBFILES */
 
 #define wxCRT_PutsA       puts
 #define wxCRT_FputsA      fputs
@@ -609,12 +609,12 @@ WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max,
         #define wxCRT_TolowerW   towlower
         #define wxCRT_ToupperW   towupper
     #endif
-#else // !__GLIBC__
+#else /* !__GLIBC__ */
     /* There is a bug in VC6 C RTL: toxxx() functions dosn't do anything
        with signed chars < 0, so "fix" it here. */
     #define wxCRT_TolowerW(c)   towlower((wxUChar)(wxChar)(c))
     #define wxCRT_ToupperW(c)   towupper((wxUChar)(wxChar)(c))
-#endif // __GLIBC__/!__GLIBC__
+#endif /* __GLIBC__/!__GLIBC__ */