On Mon, Dec 17, 2001 at 01:41:14PM +0100, Jean-Marc Lasgouttes wrote:
> >>>>> "Kayvan" == Kayvan A Sylvan <[EMAIL PROTECTED]> writes:
>
> Kayvan> The make stopped with an error trying to compile os_win32.C.
>
> What about reporting the error so that we try to fix it?
>
> Kayvan> I got around this by the following:
>
> Kayvan> mv os_win32.C os_win32.old; cp os_unix.C os_win32.C
>
> I would be surprised that interactions with latex arecorrect without
> using os_win32.C.
>
> Kayvan> Amazing, but true!
>
> Why? The windows port has existed for quite some time, and I have
> integrated most of the patches in 1.2.0cvs.
>
Hi Jean-Marc.
You are right about os_win32.C, but it needs some trivial patches to compile
cleanly.
Here they are.
---Kayvan
--
Kayvan A. Sylvan | Proud husband of | Father to my kids:
Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89)
http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
Index: src/support/os_win32.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/support/os_win32.C,v
retrieving revision 1.3
diff -u -r1.3 os_win32.C
--- src/support/os_win32.C 2001/10/08 14:09:06 1.3
+++ src/support/os_win32.C 2001/12/19 19:03:19
@@ -5,6 +5,8 @@
#include "os.h"
#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "debug.h"
#include <windows.h>
#include <io.h>
@@ -17,7 +19,7 @@
os::shell_type os::_shell = os::UNIX;
unsigned long os::cp_ = 0;
-void os::init(int * argc, char ** argv[]) {
+void os::init(int * /* argc */, char ** argv[]) {
static bool initialized = false;
if (initialized) return;
initialized = true;
@@ -109,8 +111,8 @@
if (p.empty())
return false;
- bool isDosPath = (path.length() > 1 && path[1] == ':');
- bool isUnixPath = (path[0] == '/');
+ bool isDosPath = (p.length() > 1 && p[1] == ':');
+ bool isUnixPath = (p[0] == '/');
return isDosPath | isUnixPath;
}
