rpms/muParser/F-7 muParser-244309.patch, NONE, 1.1 muParser.spec, 1.1, 1.2

[Frank Büttner (frankb)]

Author: frankb

Update of /cvs/extras/rpms/muParser/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22321

Modified Files:
	muParser.spec 
Added Files:
	muParser-244309.patch 
Log Message:
fix for #244309


muParser-244309.patch:

--- NEW FILE muParser-244309.patch ---
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
+
 //---------------------------------------------------------------------------
 //
 //


Index: muParser.spec
===================================================================
RCS file: /cvs/extras/rpms/muParser/F-7/muParser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- muParser.spec	10 Jun 2007 06:18:35 -0000	1.1
+++ muParser.spec	15 Jun 2007 13:25:41 -0000	1.2
@@ -1,12 +1,13 @@
 Name:		muParser
 Summary:	A fast math parser library
 Version:	1.27
-Release:	4%{?dist}
+Release:	5%{?dist}
 BuildRequires:	dos2unix
 URL:		http://muparser.sourceforge.net
 License:	MIT
 Group:          Development/Libraries
 Source:		http://puzzle.dl.sourceforge.net/sourceforge/muparser/muparser_v127.tar.gz		
+Patch0:		muParser-244309.patch	
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package devel
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q -n muparser
+%patch0 -p1
 
 %build
 %configure --enable-shared=yes --enable-debug=yes --enable-samples=no
@@ -60,6 +62,8 @@
 %{_libdir}/pkgconfig/muparser.pc
 
 %changelog
+* Fri Jun 15 2007 Frank Büttner <frank-buettner at gmx.net> - 1.27-5%{?dist}
+ - fix bug #244309
 * Fri Jun 08 2007 Frank Büttner <frank-buettner at gmx.net> - 1.27-4%{?dist}
  - fix depend on pkgconfig
 * Wed Jun 06 2007 Frank Büttner <frank-buettner at gmx.net> - 1.27-3%{?dist}