From d6301fca6b78db52d0d98f8e0799aba175ad2e59 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:21:41 +0200
Subject: 5.8

---
 zen/IFileOperation/dll_main.cpp |  2 +-
 zen/IFileOperation/file_op.cpp  |  2 +-
 zen/IFileOperation/file_op.h    | 20 +++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'zen/IFileOperation')

diff --git a/zen/IFileOperation/dll_main.cpp b/zen/IFileOperation/dll_main.cpp
index 95d14910..4665154a 100644
--- a/zen/IFileOperation/dll_main.cpp
+++ b/zen/IFileOperation/dll_main.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 
diff --git a/zen/IFileOperation/file_op.cpp b/zen/IFileOperation/file_op.cpp
index 3861c5c0..8acc3d17 100644
--- a/zen/IFileOperation/file_op.cpp
+++ b/zen/IFileOperation/file_op.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #include "file_op.h"
diff --git a/zen/IFileOperation/file_op.h b/zen/IFileOperation/file_op.h
index c9df1e1e..86efc340 100644
--- a/zen/IFileOperation/file_op.h
+++ b/zen/IFileOperation/file_op.h
@@ -1,16 +1,16 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef RECYCLER_DLL_H
 #define RECYCLER_DLL_H
 
 #ifdef FILE_OP_DLL_EXPORTS
-#define FILE_OP_DLL_API extern "C" __declspec(dllexport)
+#define DLL_FUNCTION_DECLARATION extern "C" __declspec(dllexport)
 #else
-#define FILE_OP_DLL_API extern "C" __declspec(dllimport)
+#define DLL_FUNCTION_DECLARATION extern "C" __declspec(dllimport)
 #endif
 
 #include <zen/build_info.h>
@@ -25,25 +25,25 @@ namespace fileop
 //COM needs to be initialized before calling any of these functions! CoInitializeEx/CoUninitialize
 //minimum OS: Windows Vista or later
 
-FILE_OP_DLL_API
+DLL_FUNCTION_DECLARATION
 bool moveToRecycleBin(const wchar_t* fileNames[],
                       size_t         fileNo); //size of fileNames array
 
-FILE_OP_DLL_API
+DLL_FUNCTION_DECLARATION
 bool copyFile(const wchar_t* sourceFile,
               const wchar_t* targetFile);
 
-FILE_OP_DLL_API
+DLL_FUNCTION_DECLARATION
 bool checkRecycler(const wchar_t* dirname, bool& isRecycler); //returns false on error
 
-FILE_OP_DLL_API
+DLL_FUNCTION_DECLARATION
 bool getLockingProcesses(const wchar_t* filename, const wchar_t*& procList); //get list of processes as single string, call freeString(procList) after use!
 
-FILE_OP_DLL_API
+DLL_FUNCTION_DECLARATION
 void freeString(const wchar_t* str);
 
 //get last error message if any of the functions above fail
-FILE_OP_DLL_API
+DLL_FUNCTION_DECLARATION
 const wchar_t* getLastError(); //no nullptr check required!
 
 /*----------
@@ -73,4 +73,6 @@ const char funName_getLastError       [] = "getLastError";
 inline const wchar_t* getDllName() { return zen::is64BitBuild ? L"FileOperation_x64.dll" : L"FileOperation_Win32.dll"; }
 }
 
+#undef DLL_FUNCTION_DECLARATION
+
 #endif //RECYCLER_DLL_H
-- 
cgit