Attachment 157047 Details for Bug 244309 – Allow using muParserDLL.h on non-Windows systems

[patch] Allow using muParserDLL.h on non-Windows systems

muParser-shared-on-non-win32.patch (text/plain), 1.78 KB, created by Zoltan Boszormenyi on 2007-06-14 21:43:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zoltan Boszormenyi

Created: 2007-06-14 21:43:48 UTC

Size: 1.78 KB

patch

obsolete

>diff -durpN muparser.orig/include/muParserDLL.h muparser/include/muParserDLL.h
>--- muparser.orig/include/muParserDLL.h	2007-06-14 23:20:52.000000000 +0200
>+++ muparser/include/muParserDLL.h	2007-06-14 23:04:21.000000000 +0200
>@@ -32,6 +32,7 @@
> #ifndef MU_PARSER_DLL_H
> #define MU_PARSER_DLL_H
> 
>+#ifdef WIN32
> #ifdef MUPARSERLIB_EXPORTS
> #define MU_PARSER_API __declspec(dllexport) 
> #else
>@@ -42,6 +43,12 @@
> #define WIN32_LEAN_AND_MEAN
> #include <windows.h>
> 
>+#else
>+
>+#define MU_PARSER_API
>+
>+#endif
>+
> typedef void* parser_handle;
> typedef double (*fun_type1)(double); 
> typedef double (*fun_type2)(double, double); 
>@@ -60,7 +67,7 @@ extern "C"
> {
> 
> // Basic operations / initialization  
>-MU_PARSER_API parser_handle mupInit();
>+MU_PARSER_API parser_handle mupInit(void);
> MU_PARSER_API void mupRelease(parser_handle a_hParser);
> MU_PARSER_API const char* mupGetExpr(parser_handle a_hParser);
> MU_PARSER_API void mupSetExpr(parser_handle a_hParser, const char *a_szExpr);
>diff -durpN muparser.orig/src/muParserDLL.cpp muparser/src/muParserDLL.cpp
>--- muparser.orig/src/muParserDLL.cpp	2006-12-16 00:47:55.000000000 +0100
>+++ muparser/src/muParserDLL.cpp	2007-06-14 23:18:48.000000000 +0200
>@@ -24,7 +24,7 @@
> */
> 
> 
>-#if defined(MUPARSER_DLL) && defined(_WIN32)
>+#if defined(MUPARSER_DLL)
> 
> #include "muParserDLL.h"
> #include "muParser.h"
>@@ -95,6 +95,8 @@ parser_type GetPtr(parser_handle a_hPars
>   return static_cast<parser_type>(a_hParser);
> }
> 
>+#if defined(_WIN32)
>+
> //---------------------------------------------------------------------------
> /** \brief DLL entry point.
> */
>@@ -116,6 +118,8 @@ BOOL APIENTRY DllMain( HANDLE /*hModule*
>   return TRUE;
> }
> 
>+#endif
>+
> //---------------------------------------------------------------------------
> //
> //

Actions: View | Diff

Attachments on bug 244309: 157047