Skip to content

Commit 7d5f8ba

Browse files
author
Oleh Kulykov
committed
1722292890
1 parent c6ec89f commit 7d5f8ba

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

libplzma.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
#endif
6868

6969
// Attribute
70-
#if defined(__GNUC__) && (__GNUC__ >= 4)
70+
#if !defined(LIBPLZMA_OS_WINDOWS) && defined(__GNUC__) && (__GNUC__ >= 4)
7171
#define LIBPLZMA_ATTRIB __attribute__((visibility("default")))
7272
#define LIBPLZMA_ATTRIB_PRIVATE __attribute__((visibility("hidden")))
7373
#endif

src/plzma_file_utils.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace plzma {
4141
namespace fileUtils {
4242

4343
inline int fileSeek(FILE * LIBPLZMA_NONNULL file, const int64_t offset, const int origin) noexcept {
44-
#if defined(LIBPLZMA_MSC)
44+
#if defined(LIBPLZMA_MSC) || defined(LIBPLZMA_MINGW)
4545
return _fseeki64(file, offset, origin);
4646
#elif defined(LIBPLZMA_POSIX)
4747
return fseeko(file, offset, origin);

src/plzma_private.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -152,22 +152,6 @@
152152
# error "Configuration error: MinGW without posix."
153153
#endif
154154

155-
#if defined(LIBPLZMA_MINGW)
156-
# undef LIBPLZMA_C_API_PRIVATE
157-
# define LIBPLZMA_C_API_PRIVATE(RETURN_TYPE) LIBPLZMA_C_EXTERN RETURN_TYPE
158-
#endif
159-
160-
#if defined(__GNUC__) || defined(__clang__)
161-
# define LIBPLZMA_PACKED_ALIGNED_START(ALIGN)
162-
# define LIBPLZMA_PACKED_ALIGNED_END(ALIGN) __attribute__((packed, aligned(ALIGN)))
163-
#elif defined(_MSC_VER) || defined(_MSC_FULL_VER)
164-
# define LIBPLZMA_PACKED_ALIGNED_START(ALIGN) __pragma( pack(push, ALIGN) )
165-
# define LIBPLZMA_PACKED_ALIGNED_END(ALIGN) __pragma( pack(pop) )
166-
#else // !(_MSC_VER || _MSC_FULL_VER)
167-
# define LIBPLZMA_PACKED_ALIGNED_START(ALIGN)
168-
# define LIBPLZMA_PACKED_ALIGNED_END(ALIGN)
169-
#endif // __GNUC__ || __clang__
170-
171155
#if defined(LIBPLZMA_OS_WINDOWS)
172156

173157
# if !defined(LIBPLZMA_MSC) && (defined(_MSC_VER) || defined(_MSC_FULL_VER))

0 commit comments

Comments
 (0)