Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fix (include order) for Unicode under Unix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-08-05 17:56:52 +00:00
parent b03f81b778
commit 54afeafe9b
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/wx/defs.h
View File

@@ -367,6 +367,27 @@ class WXDLLEXPORT wxEvent;
// Very common macros // Very common macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Printf-like attribute definitions to obtain warnings with GNU C/C++
#if defined(__GNUC__) && !wxUSE_UNICODE
# ifndef ATTRIBUTE_PRINTF
# define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
# define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
# define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
# define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
# define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
# define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
# endif /* ATTRIBUTE_PRINTF */
#else
# ifndef ATTRIBUTE_PRINTF
# define ATTRIBUTE_PRINTF
# define ATTRIBUTE_PRINTF_1
# define ATTRIBUTE_PRINTF_2
# define ATTRIBUTE_PRINTF_3
# define ATTRIBUTE_PRINTF_4
# define ATTRIBUTE_PRINTF_5
# endif /* ATTRIBUTE_PRINTF */
#endif
// everybody gets the assert and other debug macros // everybody gets the assert and other debug macros
#ifdef __cplusplus #ifdef __cplusplus
#include "wx/debug.h" #include "wx/debug.h"
@@ -444,27 +465,6 @@ class WXDLLEXPORT wxEvent;
typedef void (*wxFunction) (wxObject&, wxEvent&); typedef void (*wxFunction) (wxObject&, wxEvent&);
#endif #endif
// Printf-like attribute definitions to obtain warnings with GNU C/C++
#if defined(__GNUC__) && !wxUSE_UNICODE
# ifndef ATTRIBUTE_PRINTF
# define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
# define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
# define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
# define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
# define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
# define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
# endif /* ATTRIBUTE_PRINTF */
#else
# ifndef ATTRIBUTE_PRINTF
# define ATTRIBUTE_PRINTF
# define ATTRIBUTE_PRINTF_1
# define ATTRIBUTE_PRINTF_2
# define ATTRIBUTE_PRINTF_3
# define ATTRIBUTE_PRINTF_4
# define ATTRIBUTE_PRINTF_5
# endif /* ATTRIBUTE_PRINTF */
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// OS mnemonics -- Identify the running OS (useful for Windows) // OS mnemonics -- Identify the running OS (useful for Windows)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------