Hi Kevin,
On Sat, 23 Nov 2002 22:11:23 -0500 (EST) Kevin Atkinson
<[EMAIL PROTECTED]> wrote:
> Aspell 0.50.3 is now Available.
Congrats!
I've also updated the mingw win32 binaries and makefiles, they are
available for download at [1].
For those interested in compiled dictionaries: The GAIM/win32 project
[2] hosts a complete set (using a win32 installer). I had no contact
with those guys yet, so maybe I should ask them for a common install
dir or even zip'ed dictionaries, so *nix people can use them, too.
The attached mingw-changes.diff contains following changes:
- modules/speller/default/readonly_ws.cpp
OUT already defined by mingw-gcc
- common/info.cpp
ERROR already defined by mingw-gcc
- common/iostream.hpp
Linking problems in aspell.exe with mingw-gcc, caused by dllimport.
Cygwin's linker still insists on this setting, so I suggest to
remove the "defined (_WIN32)" check.
- prog/aspell.cpp
Pipemode (-a) failed, because setvbuf() doesn't accept zero bufsize
on win32. The fix isn't tested with other apps, as I don't know any,
that has been ported.
What do you think of including these diffs?
What do you think of including the win32 tree (from [1]) into ASpell
(i.e. Makefile, settings.h, Readme-win32.txt)?
- A build using configure/autotools (if this should work for mingw one
day) depends on a quite complex setup. An additional standalone
Makefile is a quite common solution.
- It could also contain the Visual C diffs / build files (if they
should be included).
Btw, the --enable-relocatable description in your Readme is a bit wrong:
The bin dir detection is not included in your sources, only the changed
home dir. Anyway, the bin dir detection from the ASpell-0.33 patch only
worked for "aspell config", but not for other commands, e.g. "check"
(when applied to 0.50).
Anyway, thanks for your work
and best regards,
Thorsten
----
Downloads:
[1] ASpell-0.50.3 (native win32)
http://sourceforge.net/project/showfiles.php?group_id=53368&release_id=124113
[2] GAIM/win32 downloads (dictionaries)
http://gaim.sourceforge.net/win32/
--
Thorsten Maerz <[EMAIL PROTECTED]>
Sylpheed-claws/Win32: http://claws-w32.sf.net
diff -ur aspell-0.50.3.org/common/info.cpp aspell-0.50.3/common/info.cpp
--- aspell-0.50.3.org/common/info.cpp Mon Aug 12 23:10:18 2002
+++ aspell-0.50.3/common/info.cpp Sun Nov 24 10:06:14 2002
@@ -31,6 +31,10 @@
#include "stack_ptr.hpp"
#include "strtonum.hpp"
+#ifdef ERROR
+# undef ERROR
+#endif
+
namespace acommon {
class Dir {
diff -ur aspell-0.50.3.org/common/iostream.hpp aspell-0.50.3/common/iostream.hpp
--- aspell-0.50.3.org/common/iostream.hpp Tue Aug 27 11:51:38 2002
+++ aspell-0.50.3/common/iostream.hpp Sun Nov 24 18:14:24 2002
@@ -9,7 +9,7 @@
#include "fstream.hpp"
-#if defined(__CYGWIN__) || defined (_WIN32)
+#if defined(__CYGWIN__)
#define DLLIMPORT __declspec(dllimport)
#else
#define DLLIMPORT
diff -ur aspell-0.50.3.org/modules/speller/default/readonly_ws.cpp
aspell-0.50.3/modules/speller/default/readonly_ws.cpp
--- aspell-0.50.3.org/modules/speller/default/readonly_ws.cpp Sun Mar 24 06:35:16
2002
+++ aspell-0.50.3/modules/speller/default/readonly_ws.cpp Sun Nov 24 10:06:14
+2002
@@ -101,6 +101,10 @@
#endif
+#ifdef OUT
+# undef OUT
+#endif
+
#ifndef MAP_FAILED
#define MAP_FAILED (-1)
#endif
diff -ur aspell-0.50.3.org/prog/aspell.cpp aspell-0.50.3/prog/aspell.cpp
--- aspell-0.50.3.org/prog/aspell.cpp Mon Nov 4 22:36:20 2002
+++ aspell-0.50.3/prog/aspell.cpp Sun Nov 24 18:30:24 2002
@@ -60,6 +60,12 @@
void repl();
void soundslike();
+#ifdef WIN32
+# define STDIOBUFSIZE 2
+#else
+# define STDIOBUFSIZE 0
+#endif
+
#define EXIT_ON_ERR(command) \
do{PosibErrBase pe(command);\
if(pe.has_err()){CERR<<"Error: "<< pe.get_err()->mesg << "\n"; exit(1);}\
@@ -455,8 +461,8 @@
void pipe()
{
// set up stdin and stdout to be line buffered
- assert(setvbuf(stdin, 0, _IOLBF, 0) == 0);
- assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
+ assert(setvbuf(stdin, 0, _IOLBF, STDIOBUFSIZE) == 0);
+ assert(setvbuf(stdout, 0, _IOLBF, STDIOBUFSIZE) == 0);
bool terse_mode = true;
bool do_time = options->retrieve_bool("time");
