1 --- enchant-1.4.2/src/myspell/affixmgr.hxx Tue May 6 04:19:18 2008 2 +++ enchant-1.4.2-new//src/myspell/affixmgr.hxx Fri Oct 31 18:12:50 2008 3 @@ -2,11 +2,11 @@ 4 #define _AFFIXMGR_HXX_ 5 6 #ifdef MOZILLA_CLIENT 7 +#include <stdio.h> 8 +#else 9 #ifdef __SUNPRO_CC // for SunONE Studio compiler 10 using namespace std; 11 #endif 12 -#include <stdio.h> 13 -#else 14 #include <cstdio> 15 #endif 16 17 --- enchant-1.4.2/src/myspell/atypes.hxx Tue May 6 04:19:18 2008 18 +++ enchant-1.4.2-new//src/myspell/atypes.hxx Fri Oct 31 18:04:33 2008 19 @@ -1,6 +1,8 @@ 20 #ifndef _ATYPES_HXX_ 21 #define _ATYPES_HXX_ 22 23 +#include <stdio.h> 24 + 25 #ifndef HUNSPELL_WARNING 26 #ifdef HUNSPELL_WARNING_ON 27 #define HUNSPELL_WARNING fprintf 28 --- enchant-1.4.2/src/myspell/hunzip.cxx Tue May 6 04:19:18 2008 29 +++ enchant-1.4.2-new//src/myspell/hunzip.cxx Fri Oct 31 18:13:39 2008 30 @@ -1,4 +1,7 @@ 31 #ifndef MOZILLA_CLIENT 32 +#ifdef __SUNPRO_CC 33 +using namespace std; 34 +#endif 35 #include <cstdlib> 36 #include <cstring> 37 #include <cstdio> 38 diff -ur enchant-1.4.2/src/myspell/hunzip.hxx enchant-1.4.2-new//src/myspell/hunzip.hxx 39 --- enchant-1.4.2/src/myspell/hunzip.hxx Tue May 6 04:19:17 2008 40 +++ enchant-1.4.2-new//src/myspell/hunzip.hxx Fri Oct 31 18:05:33 2008 41 @@ -12,6 +12,8 @@ 42 #define MSG_MEMORY "error: %s: missing memory\n" 43 #define MSG_KEY "error: %s: missing or bad password\n" 44 45 +#include <stdio.h> 46 + 47 struct bit { 48 unsigned char c[2]; 49 int v[2]; 50 diff -ur enchant-1.4.2/src/myspell/phonet.cxx enchant-1.4.2-new//src/myspell/phonet.cxx 51 --- enchant-1.4.2/src/myspell/phonet.cxx Tue May 6 04:19:17 2008 52 +++ enchant-1.4.2-new//src/myspell/phonet.cxx Fri Oct 31 18:14:35 2008 53 @@ -28,6 +28,9 @@ 54 */ 55 56 #ifndef MOZILLA_CLIENT 57 +#ifdef __SUNPRO_CC 58 +using namespace std; 59 +#endif 60 #include <cstdlib> 61 #include <cstring> 62 #include <cstdio> 63 diff -ur enchant-1.4.2/src/myspell/w_char.hxx enchant-1.4.2-new//src/myspell/w_char.hxx 64 --- enchant-1.4.2/src/myspell/w_char.hxx Tue May 6 04:19:18 2008 65 +++ enchant-1.4.2-new//src/myspell/w_char.hxx Fri Oct 31 18:04:51 2008 66 @@ -4,7 +4,7 @@ 67 #ifdef WIN32 68 typedef struct { 69 #else 70 -typedef struct __attribute__ ((packed)) { 71 +typedef struct { 72 #endif 73 unsigned char l; 74 unsigned char h; 75 --- enchant-1.4.2/tests/Makefile.am 2008-05-06 04:19:20.000000000 +0800 76 +++ enchant-1.4.2-new/tests/Makefile.am 2008-10-31 18:29:17.344700595 +0800 77 @@ -1,4 +1,4 @@ 78 -INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) $(CXX_WARN_CFLAGS) 79 +INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) 80 81 EXTRA_DIST=test.pwl ispell.in 82