diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-05-05 13:42:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-05 13:42:39 -0700 |
| commit | e8c23168fabae9b1426df22ca0a24261959e3b11 (patch) | |
| tree | b18f1859277e763803cfba61b939884d60d22360 /ports/bzip2 | |
| parent | 8dea147fff1cbf23114f1ca0ef09c31e93d74338 (diff) | |
| parent | 1c70d26ad1ad53c4afd53cc9c4ef729227e72c24 (diff) | |
| download | vcpkg-e8c23168fabae9b1426df22ca0a24261959e3b11.tar.gz vcpkg-e8c23168fabae9b1426df22ca0a24261959e3b11.zip | |
Merge pull request #1031 from muemart/eol
Force LF line endings for patch files
Diffstat (limited to 'ports/bzip2')
| -rw-r--r-- | ports/bzip2/auto-define-import-macro.patch | 26 | ||||
| -rw-r--r-- | ports/bzip2/fix-import-export-macros.patch | 80 |
2 files changed, 53 insertions, 53 deletions
diff --git a/ports/bzip2/auto-define-import-macro.patch b/ports/bzip2/auto-define-import-macro.patch index 81492d3a5..b0eae0796 100644 --- a/ports/bzip2/auto-define-import-macro.patch +++ b/ports/bzip2/auto-define-import-macro.patch @@ -1,13 +1,13 @@ -diff --git a/bzlib.h b/bzlib.h
-index e3ba1d6..d3bed44 100644
---- a/bzlib.h
-+++ b/bzlib.h
-@@ -26,6 +26,8 @@
- extern "C" {
- #endif
-
-+#define BZ_IMPORT
-+
- #define BZ_RUN 0
- #define BZ_FLUSH 1
- #define BZ_FINISH 2
+diff --git a/bzlib.h b/bzlib.h +index e3ba1d6..d3bed44 100644 +--- a/bzlib.h ++++ b/bzlib.h +@@ -26,6 +26,8 @@ + extern "C" { + #endif + ++#define BZ_IMPORT ++ + #define BZ_RUN 0 + #define BZ_FLUSH 1 + #define BZ_FINISH 2 diff --git a/ports/bzip2/fix-import-export-macros.patch b/ports/bzip2/fix-import-export-macros.patch index e3ee8494b..fc67887da 100644 --- a/ports/bzip2/fix-import-export-macros.patch +++ b/ports/bzip2/fix-import-export-macros.patch @@ -1,40 +1,40 @@ -diff --git a/bzlib.h b/bzlib.h
-index 8277123..84fbd0a 100644
---- a/bzlib.h
-+++ b/bzlib.h
-@@ -65,29 +65,23 @@ typedef
- }
- bz_stream;
-
--
--#ifndef BZ_IMPORT
--#define BZ_EXPORT
--#endif
--
- #ifndef BZ_NO_STDIO
- /* Need a definitition for FILE */
- #include <stdio.h>
- #endif
-
- #ifdef _WIN32
--# include <windows.h>
- # ifdef small
- /* windows.h define small to char */
- # undef small
- # endif
--# ifdef BZ_EXPORT
--# define BZ_API(func) WINAPI func
--# define BZ_EXTERN extern
-+# define BZ_API(func) func
-+# if defined(BZ_BUILD_DLL)
-+# define BZ_EXTERN __declspec(dllexport)
-+# elif defined(BZ_IMPORT)
-+# define BZ_EXTERN __declspec(dllimport)
- # else
-- /* import windows dll dynamically */
--# define BZ_API(func) (WINAPI * func)
--# define BZ_EXTERN
-+# define BZ_EXTERN
- # endif
- #else
- # define BZ_API(func) func
+diff --git a/bzlib.h b/bzlib.h +index 8277123..84fbd0a 100644 +--- a/bzlib.h ++++ b/bzlib.h +@@ -65,29 +65,23 @@ typedef + } + bz_stream; + +- +-#ifndef BZ_IMPORT +-#define BZ_EXPORT +-#endif +- + #ifndef BZ_NO_STDIO + /* Need a definitition for FILE */ + #include <stdio.h> + #endif + + #ifdef _WIN32 +-# include <windows.h> + # ifdef small + /* windows.h define small to char */ + # undef small + # endif +-# ifdef BZ_EXPORT +-# define BZ_API(func) WINAPI func +-# define BZ_EXTERN extern ++# define BZ_API(func) func ++# if defined(BZ_BUILD_DLL) ++# define BZ_EXTERN __declspec(dllexport) ++# elif defined(BZ_IMPORT) ++# define BZ_EXTERN __declspec(dllimport) + # else +- /* import windows dll dynamically */ +-# define BZ_API(func) (WINAPI * func) +-# define BZ_EXTERN ++# define BZ_EXTERN + # endif + #else + # define BZ_API(func) func |