Re: [Lzip-bug] Version 1.11-rc5 of lzip released

[Antonio Diaz Diaz]

JonY wrote:
> The hacks are relatively benign. Here are the short inserts to make 
> main.cc and lziprecover.cc compile, along with my reasons.

Just to be sure before releasing 1.5, could you please check the 
attached patch. It would be great if it makes lzip compile unmodified on 
windows and OS/2.


Best regards,
Antonio.

diff -urdN ../old_src/lziprecover.cc ./lziprecover.cc
--- ../old_src/lziprecover.cc   2010-08-30 19:26:50.000000000 +0200
+++ ./lziprecover.cc    2010-09-01 17:54:16.000000000 +0200
@@ -35,6 +35,12 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#if defined(__MSVCRT__)
+#define S_IRGRP 0
+#define S_IWGRP 0
+#define S_IROTH 0
+#define S_IWOTH 0
+#endif
 
 #include "arg_parser.h"
 #include "lzip.h"
diff -urdN ../old_src/main.cc ./main.cc
--- ../old_src/main.cc  2010-08-25 17:34:33.000000000 +0200
+++ ./main.cc   2010-09-01 17:54:16.000000000 +0200
@@ -37,7 +37,18 @@
 #include <unistd.h>
 #include <utime.h>
 #include <sys/stat.h>
-#if defined(__MSVCRT__) || defined(__OS2__)
+#if defined(__MSVCRT__)
+#include <io.h>
+#define fchmod(x,y) 0
+#define fchown(x,y,z) 0
+#define SIGHUP SIGTERM
+#define S_ISSOCK(x) 0
+#define S_IRGRP 0
+#define S_IWGRP 0
+#define S_IROTH 0
+#define S_IWOTH 0
+#endif
+#if defined(__OS2__)
 #include <io.h>
 #endif