diff options
| author | Dom Lachowicz <domlachowicz@gmail.com> | 2009-01-24 14:44:19 +0000 |
|---|---|---|
| committer | Dom Lachowicz <domlachowicz@gmail.com> | 2009-01-24 14:44:19 +0000 |
| commit | 311c687895b2d84a5cb17ec886848d518105feff (patch) | |
| tree | a42f6900ba02b6c665d2e3723fc24463038fbf7b | |
| parent | 2f157306e706ab95f90d137f44efe483818b53ba (diff) | |
| download | enchant-311c687895b2d84a5cb17ec886848d518105feff.tar.gz | |
Bug 10667 - stdio.h not included in two files so FILE not defined
Patch from jeff.kai @ sun.com
git-svn-id: svn+ssh://svn.abisource.com/svnroot/enchant/trunk@25540 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
| -rw-r--r-- | src/myspell/affixmgr.hxx | 4 | ||||
| -rw-r--r-- | src/myspell/atypes.hxx | 2 | ||||
| -rw-r--r-- | src/myspell/hunzip.cxx | 3 | ||||
| -rw-r--r-- | src/myspell/hunzip.hxx | 2 | ||||
| -rw-r--r-- | src/myspell/phonet.cxx | 3 | ||||
| -rw-r--r-- | src/myspell/w_char.hxx | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
7 files changed, 14 insertions, 4 deletions
diff --git a/src/myspell/affixmgr.hxx b/src/myspell/affixmgr.hxx index f045b87..392ac49 100644 --- a/src/myspell/affixmgr.hxx +++ b/src/myspell/affixmgr.hxx @@ -2,11 +2,11 @@ #define _AFFIXMGR_HXX_ #ifdef MOZILLA_CLIENT +#include <stdio.h> +#else #ifdef __SUNPRO_CC // for SunONE Studio compiler using namespace std; #endif -#include <stdio.h> -#else #include <cstdio> #endif diff --git a/src/myspell/atypes.hxx b/src/myspell/atypes.hxx index 0d4db14..a5566f8 100644 --- a/src/myspell/atypes.hxx +++ b/src/myspell/atypes.hxx @@ -1,6 +1,8 @@ #ifndef _ATYPES_HXX_ #define _ATYPES_HXX_ +#include <stdio.h> + #ifndef HUNSPELL_WARNING #ifdef HUNSPELL_WARNING_ON #define HUNSPELL_WARNING fprintf diff --git a/src/myspell/hunzip.cxx b/src/myspell/hunzip.cxx index f9091b8..63124e4 100644 --- a/src/myspell/hunzip.cxx +++ b/src/myspell/hunzip.cxx @@ -1,4 +1,7 @@ #ifndef MOZILLA_CLIENT +#ifdef __SUNPRO_CC +using namespace std; +#endif #include <cstdlib> #include <cstring> #include <cstdio> diff --git a/src/myspell/hunzip.hxx b/src/myspell/hunzip.hxx index 52109d1..364557b 100644 --- a/src/myspell/hunzip.hxx +++ b/src/myspell/hunzip.hxx @@ -12,6 +12,8 @@ #define MSG_MEMORY "error: %s: missing memory\n" #define MSG_KEY "error: %s: missing or bad password\n" +#include <stdio.h> + struct bit { unsigned char c[2]; int v[2]; diff --git a/src/myspell/phonet.cxx b/src/myspell/phonet.cxx index 91dc419..cd77fba 100644 --- a/src/myspell/phonet.cxx +++ b/src/myspell/phonet.cxx @@ -28,6 +28,9 @@ */ #ifndef MOZILLA_CLIENT +#ifdef __SUNPRO_CC +using namespace std; +#endif #include <cstdlib> #include <cstring> #include <cstdio> diff --git a/src/myspell/w_char.hxx b/src/myspell/w_char.hxx index a3d11c3..af47e1a 100644 --- a/src/myspell/w_char.hxx +++ b/src/myspell/w_char.hxx @@ -4,7 +4,7 @@ #ifdef WIN32 typedef struct { #else -typedef struct __attribute__ ((packed)) { +typedef struct { #endif unsigned char l; unsigned char h; diff --git a/tests/Makefile.am b/tests/Makefile.am index ab82b1d..0980415 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) $(CXX_WARN_CFLAGS) +INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) EXTRA_DIST=test.pwl ispell.in |