This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to tag v1.0.0 in repository osmium-tool.
commit a1344c137153f00aad26e52e35bb4997429a900b Author: Jochen Topf <joc...@topf.org> Date: Mon Nov 10 17:36:49 2014 +0100 Fix include order. This fixes build problem on OSX. --- src/command_fileinfo.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/command_fileinfo.cpp b/src/command_fileinfo.cpp index ef67b35..f1e1c42 100644 --- a/src/command_fileinfo.cpp +++ b/src/command_fileinfo.cpp @@ -29,12 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # include <unistd.h> #endif -#ifdef USE_CRYPTOPP -# include <cryptopp/sha.h> -#else -# include <crypto++/sha.h> -#endif - #include <boost/program_options.hpp> namespace po = boost::program_options; @@ -45,6 +39,13 @@ namespace po = boost::program_options; #include "command_fileinfo.hpp" +// this must be after the local includes.. +#ifdef USE_CRYPTOPP +# include <cryptopp/sha.h> +#else +# include <crypto++/sha.h> +#endif + bool CommandFileinfo::setup(const std::vector<std::string>& arguments) { po::variables_map vm; try { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel