diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
commit | 7495c61d49208a9fc90b937bca548d9005ff17c8 (patch) | |
tree | 5eec5f802d3146b8b1f788aa1275ea1c44a24d31 /pkgs/development/libraries/aspell/clang.patch | |
parent | ed867a50eb89a90db3b1741bf4c0bf0cd4557dba (diff) | |
parent | 899d81b37ba6dc26431b82b40300505f19504e03 (diff) | |
download | nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.gz nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.bz2 nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.lz nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.xz nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.zst nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.zip |
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts: pkgs/applications/editors/vim/macvim.nix
Diffstat (limited to 'pkgs/development/libraries/aspell/clang.patch')
-rw-r--r-- | pkgs/development/libraries/aspell/clang.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/libraries/aspell/clang.patch b/pkgs/development/libraries/aspell/clang.patch new file mode 100644 index 00000000000..c4cfa426588 --- /dev/null +++ b/pkgs/development/libraries/aspell/clang.patch @@ -0,0 +1,18 @@ +--- interfaces/cc/aspell.h 2013-10-13 20:29:33.000000000 +0200 ++++ interfaces/cc/aspell.h 2013-10-13 20:30:01.000000000 +0200 +@@ -237,6 +237,7 @@ + /******************************** errors ********************************/ + + ++#ifndef __cplusplus + 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,6 +323,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 *******************************/ |