Attachment #460522 for bug #606162

View | Details | Raw Unified | Return to bug 606162
Collapse All | Expand All




	#endif
#endif

#ifdef ASTYLE_LIB

	// define STDCALL and EXPORT for Windows
	// MINGW defines STDCALL in Windows.h (actually windef.h)
	// EXPORT has no value if ASTYLE_NO_EXPORT is defined
	#ifdef _WIN32
		#ifndef STDCALL
			#define STDCALL __stdcall
		#endif
		// define this to prevent compiler warning and error messages
		#ifdef ASTYLE_NO_EXPORT
			#define EXPORT
		#else
			#define EXPORT __declspec(dllexport)
		#endif
		// define STDCALL and EXPORT for non-Windows
		// visibility attribute allows "-fvisibility=hidden" compiler option
	#else
		#define STDCALL
		#if __GNUC__ >= 4
			#define EXPORT __attribute__ ((visibility ("default")))
		#else
			#define EXPORT
		#endif
	#endif	// #ifdef _WIN32

	// define utf-16 bit text for the platform
	typedef unsigned short utf16_t;
	// define pointers to callback error handler and memory allocation
	typedef void (STDCALL* fpError)(int errorNumber, const char* errorMessage);
	typedef char* (STDCALL* fpAlloc)(unsigned long memoryNeeded);

#endif  // #ifdef ASTYLE_LIB

//----------------------------------------------------------------------------
// astyle namespace
//----------------------------------------------------------------------------




	#pragma clang diagnostic ignored "-Wshorten-64-to-32"
#endif

#ifdef ASTYLE_LIB

	// define STDCALL and EXPORT for Windows
	// MINGW defines STDCALL in Windows.h (actually windef.h)
	// EXPORT has no value if ASTYLE_NO_EXPORT is defined
	#ifdef _WIN32
		#ifndef STDCALL
			#define STDCALL __stdcall
		#endif
		// define this to prevent compiler warning and error messages
		#ifdef ASTYLE_NO_EXPORT
			#define EXPORT
		#else
			#define EXPORT __declspec(dllexport)
		#endif
		// define STDCALL and EXPORT for non-Windows
		// visibility attribute allows "-fvisibility=hidden" compiler option
	#else
		#define STDCALL
		#if __GNUC__ >= 4
			#define EXPORT __attribute__ ((visibility ("default")))
		#else
			#define EXPORT
		#endif
	#endif	// #ifdef _WIN32

	// define utf-16 bit text for the platform
	typedef unsigned short utf16_t;
	// define pointers to callback error handler and memory allocation
	typedef void (STDCALL* fpError)(int errorNumber, const char* errorMessage);
	typedef char* (STDCALL* fpAlloc)(unsigned long memoryNeeded);

#else
	#define EXPORT
#endif  // #ifdef ASTYLE_LIB

//-----------------------------------------------------------------------------
// astyle namespace
//-----------------------------------------------------------------------------

// Class ASBeautifier
//-----------------------------------------------------------------------------

class EXPORT ASBeautifier : protected ASResource, protected ASBase
{
public:
	ASBeautifier();

// Class ASFormatter
//-----------------------------------------------------------------------------

class EXPORT ASFormatter : public ASBeautifier
{
public:	// functions
	ASFormatter();

Return to bug 606162

Lines 75-114 Link Here

(-)a/src/astyle_main.h (-34 lines)
75	#endif	75	#endif
76	#endif	76	#endif
77		77
78	#ifdef ASTYLE_LIB
79
80	// define STDCALL and EXPORT for Windows
81	// MINGW defines STDCALL in Windows.h (actually windef.h)
82	// EXPORT has no value if ASTYLE_NO_EXPORT is defined
83	#ifdef _WIN32
84	#ifndef STDCALL
85	#define STDCALL __stdcall
86	#endif
87	// define this to prevent compiler warning and error messages
88	#ifdef ASTYLE_NO_EXPORT
89	#define EXPORT
90	#else
91	#define EXPORT __declspec(dllexport)
92	#endif
93	// define STDCALL and EXPORT for non-Windows
94	// visibility attribute allows "-fvisibility=hidden" compiler option
95	#else
96	#define STDCALL
97	#if __GNUC__ >= 4
98	#define EXPORT __attribute__ ((visibility ("default")))
99	#else
100	#define EXPORT
101	#endif
102	#endif // #ifdef _WIN32
103
104	// define utf-16 bit text for the platform
105	typedef unsigned short utf16_t;
106	// define pointers to callback error handler and memory allocation
107	typedef void (STDCALL* fpError)(int errorNumber, const char* errorMessage);
108	typedef char* (STDCALL* fpAlloc)(unsigned long memoryNeeded);
109
110	#endif // #ifdef ASTYLE_LIB
111
112	//----------------------------------------------------------------------------	78	//----------------------------------------------------------------------------
113	// astyle namespace	79	// astyle namespace
114	//----------------------------------------------------------------------------	80	//----------------------------------------------------------------------------

Lines 47-52 Link Here

(-)a/src/astyle.h (-2 / +38 lines)
47	#pragma clang diagnostic ignored "-Wshorten-64-to-32"	47	#pragma clang diagnostic ignored "-Wshorten-64-to-32"
48	#endif	48	#endif
49		49
		50	#ifdef ASTYLE_LIB
		51
		52	// define STDCALL and EXPORT for Windows
		53	// MINGW defines STDCALL in Windows.h (actually windef.h)
		54	// EXPORT has no value if ASTYLE_NO_EXPORT is defined
		55	#ifdef _WIN32
		56	#ifndef STDCALL
		57	#define STDCALL __stdcall
		58	#endif
		59	// define this to prevent compiler warning and error messages
		60	#ifdef ASTYLE_NO_EXPORT
		61	#define EXPORT
		62	#else
		63	#define EXPORT __declspec(dllexport)
		64	#endif
		65	// define STDCALL and EXPORT for non-Windows
		66	// visibility attribute allows "-fvisibility=hidden" compiler option
		67	#else
		68	#define STDCALL
		69	#if __GNUC__ >= 4
		70	#define EXPORT __attribute__ ((visibility ("default")))
		71	#else
		72	#define EXPORT
		73	#endif
		74	#endif // #ifdef _WIN32
		75
		76	// define utf-16 bit text for the platform
		77	typedef unsigned short utf16_t;
		78	// define pointers to callback error handler and memory allocation
		79	typedef void (STDCALL* fpError)(int errorNumber, const char* errorMessage);
		80	typedef char* (STDCALL* fpAlloc)(unsigned long memoryNeeded);
		81
		82	#else
		83	#define EXPORT
		84	#endif // #ifdef ASTYLE_LIB
		85
50	//-----------------------------------------------------------------------------	86	//-----------------------------------------------------------------------------
51	// astyle namespace	87	// astyle namespace
52	//-----------------------------------------------------------------------------	88	//-----------------------------------------------------------------------------
Lines 326-332 Link Here
326	// Class ASBeautifier	326	// Class ASBeautifier
327	//-----------------------------------------------------------------------------	327	//-----------------------------------------------------------------------------
328		328
329	class ASBeautifier : protected ASResource, protected ASBase	329	class EXPORT ASBeautifier : protected ASResource, protected ASBase
330	{	330	{
331	public:	331	public:
332	ASBeautifier();	332	ASBeautifier();
Lines 612-618 Link Here
612	// Class ASFormatter	646	// Class ASFormatter
613	//-----------------------------------------------------------------------------	647	//-----------------------------------------------------------------------------
614		648
615	class ASFormatter : public ASBeautifier	649	class EXPORT ASFormatter : public ASBeautifier
616	{	650	{
617	public: // functions	651	public: // functions
618	ASFormatter();	652	ASFormatter();