Resolve GCC's 'type-punned pointer will break strict-aliasing rules' warning by break...

[wxWidgets.git] / include / wx / wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index ed82e422d6f0221430e14009671a54366cd30c5c..06d8157871105780ba6047daf24323b3f14fbbb9 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -1,24 +1,19 @@
-/*
- * Name:        wx/wxchar.h
- * Purpose:     Declarations common to wx char/wchar_t usage (wide chars)
- * Author:      Joel Farley, Ove Kåven
- * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
- * Created:     1998/06/12
- * RCS-ID:      $Id$
- * Copyright:   (c) 1998-2006 wxWidgets dev team
- * Licence:     wxWindows licence
- */
-
-/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
+//////////////////////////////////////////////////////////////////////////////
+// Name:        wx/wxchar.h
+// Purpose:     Declarations common to wx char/wchar_t usage (wide chars)
+// Author:      Joel Farley, Ove Kåven
+// Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
+// Created:     1998/06/12
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998-2006 wxWidgets dev team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WXCHAR_H_
 #define _WX_WXCHAR_H_
 
-/* include wxChar type definition: */
-#include "wx/chartype.h"
-
-/* and wrappers for CRT functions: */
-#include "wx/wxcrt.h"
-#include "wx/wxcrtvararg.h"
+// This header used to define CRT functions wrappers in wxWidgets 2.8. This is
+// now done in (headers included by) wx/crt.h, so include it for compatibility:
+#include "wx/crt.h"
 
 #endif /* _WX_WXCHAR_H_ */