From f22fa8979c34b22806ecac1c1e4c6fd085600762 Mon Sep 17 00:00:00 2001
From: michel <michel@ac1d8469-bf42-47a9-8791-bf33cf982152>
Date: Sun, 6 Dec 2009 13:21:52 +0000
Subject: [PATCH] 4.1 k_order_perturbation: fixing typos
git-svn-id: https://www.dynare.org/svn/dynare/trunk@3198 ac1d8469-bf42-47a9-8791-bf33cf982152
---
mex/sources/k_order_perturbation/dynamic_dll.cpp | 2 +-
mex/sources/k_order_perturbation/dynamic_dll.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mex/sources/k_order_perturbation/dynamic_dll.cpp b/mex/sources/k_order_perturbation/dynamic_dll.cpp
index 4ee119dab5..76d0f0b0f4 100644
--- a/mex/sources/k_order_perturbation/dynamic_dll.cpp
+++ b/mex/sources/k_order_perturbation/dynamic_dll.cpp
@@ -75,7 +75,7 @@ DynamicModelDLL::DynamicModelDLL(const string &modName, const int y_length, cons
DynamicModelDLL::~DynamicModelDLL()
{
-#if !defined(__CYGWIN32__) && !defined(_WIN32)
+#if defined(__CYGWIN32__) || defined(_WIN32)
FreeLibrary(dynamicHinstance);
#else
dlclose(dynamicHinstance);
diff --git a/mex/sources/k_order_perturbation/dynamic_dll.h b/mex/sources/k_order_perturbation/dynamic_dll.h
index f12996b3c8..a7e38b41b5 100644
--- a/mex/sources/k_order_perturbation/dynamic_dll.h
+++ b/mex/sources/k_order_perturbation/dynamic_dll.h
@@ -24,7 +24,7 @@
// K_ORDER_PERTURBATION_API functions as being imported from a DLL, wheras this DLL sees symbols
// defined with this macro as being exported.
-#if (defined _WIN32) || (defined __CYGWIN32__)
+#if defined(_WIN32) || defined(__CYGWIN32__)
# include <windows.h>
# ifdef _MSC_VER
# define K_ORDER_PERTURBATION_API __declspec(dllexport)
@@ -39,7 +39,7 @@
#include "dynare_exception.h"
// <model>_Dynamic DLL pointer
-#if (defined _WIN32) || (defined __CYGWIN32__)
+#if defined(_WIN32) || defined(__CYGWIN32__)
typedef void *(DynamicFn)
#else // Linux or Mac
typedef void (*DynamicFn)
@@ -56,7 +56,7 @@ typedef void *(mexFunctionPtr)(int nlhs, mxArray *plhs[], int nrhs, const mxArra
class DynamicModelDLL
{
private:
-#if (defined _WIN32) || (defined __CYGWIN32__)
+#if defined(_WIN32) || defined(__CYGWIN32__)
DynamicFn *Dynamic; // pointer to the Dynamic function in DLL
#else
DynamicFn Dynamic; // pointer to the Dynamic function in DLL
--
GitLab