Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make config.h more Autoconf friendly (GH #835) #836

Merged
merged 23 commits into from
May 17, 2019
Merged

Make config.h more Autoconf friendly (GH #835) #836

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
bc93768
Break out config.h into components
noloader May 16, 2019
376872b
Fix compile on OS X due to std::uncaught_exception define
noloader May 16, 2019
2308ca2
Fix compile due to typo
noloader May 16, 2019
432580c
Use config_ver.h in Makefiles
noloader May 17, 2019
6925220
Update comments
noloader May 17, 2019
083461a
Update comments
noloader May 17, 2019
b979a94
Update comments
noloader May 17, 2019
0418daf
Merge branch 'master' of https://github.com/weidai11/cryptopp
noloader May 17, 2019
d8b990a
Update comments
noloader May 17, 2019
b340554
Update comments
noloader May 17, 2019
2f82dde
Update comments
noloader May 17, 2019
91a65d2
Clear Clang warning for alignment requirements
noloader May 17, 2019
d6f5110
Clear Clang warning for alignment requirements
noloader May 17, 2019
c22eb40
Clear unused variable warning
noloader May 17, 2019
732f737
Clear unused variable warning
noloader May 17, 2019
686966d
Clear unused variable warning
noloader May 17, 2019
88c0789
Clear unused variable warning
noloader May 17, 2019
d112d4d
Clear GCC unknown pragma warning
noloader May 17, 2019
fc13431
Clear GCC unknown pragma warning
noloader May 17, 2019
e57aad7
Use config_asm.h
noloader May 17, 2019
d00fa82
Move endian settings to config_misc.h
noloader May 17, 2019
49161e8
Update comments
noloader May 17, 2019
82e6ca3
Update header guard
noloader May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use config_asm.h
  • Loading branch information
@noloader
noloader committed May 17, 2019
commit e57aad79e06fac9b88fc8b6302c6a340c2c86bbd
2 changes: 1 addition & 1 deletion Filelist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ cmac.cpp
cmac.h
config.h
config_align.h
config_base.h
config_asm.h
config_cpu.h
config_cxx.h
config_dll.h
Expand Down
5 changes: 3 additions & 2 deletions config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
/// \details <tt>config.h</tt> was split into components in May 2019 to better
/// integrate with Autoconf and its feature tests. The splitting occured so
/// users could continue to include <tt>config.h</tt> while allowing Autoconf
/// to write a new <tt>config_base.h</tt> using its feature tests.
/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
/// its feature tests.
/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
/// \since Crypto++ 8.3

Expand All @@ -16,7 +17,7 @@
#define CRYPTOPP_CONFIG_H

#include "config_align.h"
#include "config_base.h"
#include "config_asm.h"
#include "config_cpu.h"
#include "config_cxx.h"
#include "config_dll.h"
Expand Down
2 changes: 1 addition & 1 deletion config_align.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// \details <tt>config.h</tt> was split into components in May 2019 to better
/// integrate with Autoconf and its feature tests. The splitting occured so
/// users could continue to include <tt>config.h</tt> while allowing Autoconf
/// to write new <tt>config_base.h</tt> and new <tt>config_cxx.h</tt> using
/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
/// its feature tests.
/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
/// \since Crypto++ 8.3
Expand Down
10 changes: 5 additions & 5 deletions config_base.h → config_asm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// config_base.h - written and placed in public domain by Jeffrey Walton
// the bits that make up this source file are from the
// library's monolithic config.h.
// config_asm.h - written and placed in public domain by Jeffrey Walton
// the bits that make up this source file are from the
// library's monolithic config.h.

/// \file config_base.h
/// \file config_asm.h
/// \brief Library configuration file
/// \details <tt>config.h</tt> was split into components in May 2019 to better
/// integrate with Autoconf and its feature tests. The splitting occured so
/// users could continue to include <tt>config.h</tt> while allowing Autoconf
/// to write new <tt>config_base.h</tt> and new <tt>config_cxx.h</tt> using
/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
/// its feature tests.
/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
/// \since Crypto++ 8.3
Expand Down
2 changes: 1 addition & 1 deletion config_cpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// \details <tt>config.h</tt> was split into components in May 2019 to better
/// integrate with Autoconf and its feature tests. The splitting occured so
/// users could continue to include <tt>config.h</tt> while allowing Autoconf
/// to write new <tt>config_base.h</tt> and new <tt>config_cxx.h</tt> using
/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
/// its feature tests.
/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
/// <A HREF="https://sourceforge.net/p/predef/wiki/Architectures/">Sourceforge
Expand Down
2 changes: 1 addition & 1 deletion config_cxx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// \details <tt>config.h</tt> was split into components in May 2019 to better
/// integrate with Autoconf and its feature tests. The splitting occured so
/// users could continue to include <tt>config.h</tt> while allowing Autoconf
/// to write new <tt>config_base.h</tt> and new <tt>config_cxx.h</tt> using
/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
/// its feature tests.
/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
/// \since Crypto++ 8.3
Expand Down
2 changes: 1 addition & 1 deletion config_dll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// \details <tt>config.h</tt> was split into components in May 2019 to better
/// integrate with Autoconf and its feature tests. The splitting occured so
/// users could continue to include <tt>config.h</tt> while allowing Autoconf
/// to write new <tt>config_base.h</tt> and new <tt>config_cxx.h</tt> using
/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
/// its feature tests.
/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
/// \since Crypto++ 8.3
Expand Down
2 changes: 1 addition & 1 deletion config_int.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// \details <tt>config.h</tt> was split into components in May 2019 to better
/// integrate with Autoconf and its feature tests. The splitting occured so
/// users could continue to include <tt>config.h</tt> while allowing Autoconf
/// to write new <tt>config_base.h</tt> and new <tt>config_cxx.h</tt> using
/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
/// its feature tests.
/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
/// \since Crypto++ 8.3
Expand Down
4 changes: 2 additions & 2 deletions config_misc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
/// \details <tt>config.h</tt> was split into components in May 2019 to better
/// integrate with Autoconf and its feature tests. The splitting occured so
/// users could continue to include <tt>config.h</tt> while allowing Autoconf
/// to write new <tt>config_base.h</tt> and new <tt>config_cxx.h</tt> using
/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
/// its feature tests.
/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
/// \since Crypto++ 8.3

#ifndef CRYPTOPP_CONFIG_MISC_H
#define CRYPTOPP_CONFIG_MISC_H

#include "config_base.h"
#include "config_asm.h"
#include "config_cxx.h"
#include "config_os.h"
#include "config_ver.h"
Expand Down
2 changes: 1 addition & 1 deletion config_ns.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// \details <tt>config.h</tt> was split into components in May 2019 to better
/// integrate with Autoconf and its feature tests. The splitting occured so
/// users could continue to include <tt>config.h</tt> while allowing Autoconf
/// to write new <tt>config_base.h</tt> and new <tt>config_cxx.h</tt> using
/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
/// its feature tests.
/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
/// \since Crypto++ 8.3
Expand Down
2 changes: 1 addition & 1 deletion config_os.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// \details <tt>config.h</tt> was split into components in May 2019 to better
/// integrate with Autoconf and its feature tests. The splitting occured so
/// users could continue to include <tt>config.h</tt> while allowing Autoconf
/// to write new <tt>config_base.h</tt> and new <tt>config_cxx.h</tt> using
/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
/// its feature tests.
/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
/// \since Crypto++ 8.3
Expand Down
2 changes: 1 addition & 1 deletion config_ver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// \details <tt>config.h</tt> was split into components in May 2019 to better
/// integrate with Autoconf and its feature tests. The splitting occured so
/// users could continue to include <tt>config.h</tt> while allowing Autoconf
/// to write new <tt>config_base.h</tt> and new <tt>config_cxx.h</tt> using
/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
/// its feature tests.
/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
/// \since Crypto++ 8.3
Expand Down
2 changes: 1 addition & 1 deletion cryptdll.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
<ClInclude Include="cmac.h" />
<ClInclude Include="config.h" />
<ClInclude Include="config_align.h" />
<ClInclude Include="config_base.h" />
<ClInclude Include="config_asm.h" />
<ClInclude Include="config_cpu.h" />
<ClInclude Include="config_cxx.h" />
<ClInclude Include="config_dll.h" />
Expand Down
2 changes: 1 addition & 1 deletion cryptdll.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
<ClInclude Include="config_align.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="config_base.h">
<ClInclude Include="config_asm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="config_cpu.h">
Expand Down
2 changes: 1 addition & 1 deletion cryptlib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@
<ClInclude Include="cmac.h" />
<ClInclude Include="config.h" />
<ClInclude Include="config_align.h" />
<ClInclude Include="config_base.h" />
<ClInclude Include="config_asm.h" />
<ClInclude Include="config_cpu.h" />
<ClInclude Include="config_cxx.h" />
<ClInclude Include="config_dll.h" />
Expand Down
2 changes: 1 addition & 1 deletion cryptlib.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@
<ClInclude Include="config_align.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="config_base.h">
<ClInclude Include="config_asm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="config_cpu.h">
Expand Down