Fix build with clang 3.4

Submitted by:	dim
This commit is contained in:
Baptiste Daroussin 2014-02-11 22:56:50 +00:00
parent 6b166fc790
commit f14ccfe17b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=343830
3 changed files with 48 additions and 0 deletions

View File

@ -0,0 +1,20 @@
--- interfaces/cc/aspell.h.orig 2011-07-02 23:53:27.000000000 +0200
+++ interfaces/cc/aspell.h 2014-02-11 22:40:16.000000000 +0100
@@ -236,7 +236,7 @@
/******************************** errors ********************************/
-
+#ifndef ASPELL_ERRORS__HPP
extern const struct AspellErrorInfo * const aerror_other;
extern const struct AspellErrorInfo * const aerror_operation_not_supported;
extern const struct AspellErrorInfo * const aerror_cant_copy;
@@ -322,7 +322,7 @@
extern const struct AspellErrorInfo * const aerror_bad_magic;
extern const struct AspellErrorInfo * const aerror_expression;
extern const struct AspellErrorInfo * const aerror_invalid_expression;
-
+#endif
/******************************* speller *******************************/

View File

@ -0,0 +1,18 @@
--- prog/aspell.cpp.orig 2011-07-04 11:13:58.000000000 +0200
+++ prog/aspell.cpp 2014-02-11 22:42:04.000000000 +0100
@@ -25,6 +25,7 @@
# include <langinfo.h>
#endif
+#include "errors.hpp"
#include "aspell.h"
#ifdef USE_FILE_INO
@@ -40,7 +41,6 @@
#include "convert.hpp"
#include "document_checker.hpp"
#include "enumeration.hpp"
-#include "errors.hpp"
#include "file_util.hpp"
#include "fstream.hpp"
#include "info.hpp"

View File

@ -0,0 +1,10 @@
--- prog/hecker_string.hpp.orig 2011-07-02 23:09:09.000000000 +0200
+++ prog/checker_string.hpp 2014-02-11 22:42:24.000000000 +0100
@@ -6,6 +6,7 @@
#include <stdio.h>
+#include "errors.hpp"
#include "aspell.h"
#include "vector.hpp"