Skip to content

Commit

Permalink
Rename crypt.h to avoid conflicts
Browse files Browse the repository at this point in the history
Fixes #7: a possible conflict with crypt.h from glibc.
  • Loading branch information
stachenov committed Jun 5, 2018
1 parent 9773d88 commit ad509e8
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ RECURSIVE = YES
EXCLUDE = quazip/unzip.h \
quazip/zip.h \
quazip/ioapi.h \
quazip/crypt.h \
quazip/minizip_crypt.h \
qztest/

# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion quazip/quazip.pri
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
HEADERS += \
$$PWD/crypt.h \
$$PWD/minizip_crypt.h \
$$PWD/ioapi.h \
$$PWD/JlCompress.h \
$$PWD/quaadler32.h \
Expand Down
2 changes: 1 addition & 1 deletion quazip/quazip.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\crypt.h"
RelativePath=".\minizip_crypt.h"
>
</File>
<File
Expand Down
4 changes: 2 additions & 2 deletions quazip/quazip.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="crypt.h" />
<ClInclude Include="minizip_crypt.h" />
<ClInclude Include="ioapi.h" />
<ClInclude Include="JlCompress.h" />
<ClInclude Include="quaadler32.h" />
Expand Down Expand Up @@ -180,4 +180,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions quazip/quazip.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="crypt.h">
<ClInclude Include="minizip_crypt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ioapi.h">
Expand Down Expand Up @@ -114,4 +114,4 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions quazip/unzip.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
If, for some reason, all these files are missing, the Info-ZIP license
also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
crypt.c (full version) by Info-ZIP. Last revised: [see crypt.h]
crypt.c (full version) by Info-ZIP. Last revised: [see minizip_crypt.h]
The encryption/decryption parts of this source code (as opposed to the
non-echoing password parts) were originally written in Europe. The
Expand Down Expand Up @@ -199,7 +199,7 @@ typedef struct


#ifndef NOUNCRYPT
#include "crypt.h"
#include "minizip_crypt.h"
#endif

/* ===========================================================================
Expand Down
2 changes: 1 addition & 1 deletion quazip/zip.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ typedef struct

#ifndef NOCRYPT
#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
#include "crypt.h"
#include "minizip_crypt.h"
#endif

local linkedlist_datablock_internal* allocate_new_datablock()
Expand Down

0 comments on commit ad509e8

Please sign in to comment.