Skip to content
Snippets Groups Projects
Commit f22fa897 authored by michel's avatar michel
Browse files

4.1 k_order_perturbation: fixing typos

git-svn-id: https://www.dynare.org/svn/dynare/trunk@3198 ac1d8469-bf42-47a9-8791-bf33cf982152
parent c6ed380a
No related branches found
No related tags found
No related merge requests found
...@@ -75,7 +75,7 @@ DynamicModelDLL::DynamicModelDLL(const string &modName, const int y_length, cons ...@@ -75,7 +75,7 @@ DynamicModelDLL::DynamicModelDLL(const string &modName, const int y_length, cons
DynamicModelDLL::~DynamicModelDLL() DynamicModelDLL::~DynamicModelDLL()
{ {
#if !defined(__CYGWIN32__) && !defined(_WIN32) #if defined(__CYGWIN32__) || defined(_WIN32)
FreeLibrary(dynamicHinstance); FreeLibrary(dynamicHinstance);
#else #else
dlclose(dynamicHinstance); dlclose(dynamicHinstance);
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
// K_ORDER_PERTURBATION_API functions as being imported from a DLL, wheras this DLL sees symbols // K_ORDER_PERTURBATION_API functions as being imported from a DLL, wheras this DLL sees symbols
// defined with this macro as being exported. // defined with this macro as being exported.
#if (defined _WIN32) || (defined __CYGWIN32__) #if defined(_WIN32) || defined(__CYGWIN32__)
# include <windows.h> # include <windows.h>
# ifdef _MSC_VER # ifdef _MSC_VER
# define K_ORDER_PERTURBATION_API __declspec(dllexport) # define K_ORDER_PERTURBATION_API __declspec(dllexport)
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "dynare_exception.h" #include "dynare_exception.h"
// <model>_Dynamic DLL pointer // <model>_Dynamic DLL pointer
#if (defined _WIN32) || (defined __CYGWIN32__) #if defined(_WIN32) || defined(__CYGWIN32__)
typedef void *(DynamicFn) typedef void *(DynamicFn)
#else // Linux or Mac #else // Linux or Mac
typedef void (*DynamicFn) typedef void (*DynamicFn)
...@@ -56,7 +56,7 @@ typedef void *(mexFunctionPtr)(int nlhs, mxArray *plhs[], int nrhs, const mxArra ...@@ -56,7 +56,7 @@ typedef void *(mexFunctionPtr)(int nlhs, mxArray *plhs[], int nrhs, const mxArra
class DynamicModelDLL class DynamicModelDLL
{ {
private: private:
#if (defined _WIN32) || (defined __CYGWIN32__) #if defined(_WIN32) || defined(__CYGWIN32__)
DynamicFn *Dynamic; // pointer to the Dynamic function in DLL DynamicFn *Dynamic; // pointer to the Dynamic function in DLL
#else #else
DynamicFn Dynamic; // pointer to the Dynamic function in DLL DynamicFn Dynamic; // pointer to the Dynamic function in DLL
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment