summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjosh.macdonald@gmail.com <josh.macdonald@gmail.com@a3eca27d-f21b-0410-9b4a-6511e771f64e>2010-08-01 03:54:24 +0000
committerjosh.macdonald@gmail.com <josh.macdonald@gmail.com@a3eca27d-f21b-0410-9b4a-6511e771f64e>2010-08-01 03:54:24 +0000
commitcc9bb70bea56488e2524bb64386182ae2c069f4d (patch)
tree1cd3c206734f07d80949428fc128d0106f6290ec
parentf1f6f860e659b285b554641a28ba0a9933ddf9ef (diff)
patch for issue 111, compiles clean under cygwin gcc 4.3.4 too
-rw-r--r--xdelta3/xdelta3-main.h16
-rw-r--r--xdelta3/xdelta3-test.h2
2 files changed, 9 insertions, 9 deletions
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 5c9ecfa..13bc16f 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -418,12 +418,12 @@ main_config (void)
418 DP(RINT "XD3_DEFAULT_SRCWINSZ=%d\n", XD3_DEFAULT_SRCWINSZ); 418 DP(RINT "XD3_DEFAULT_SRCWINSZ=%d\n", XD3_DEFAULT_SRCWINSZ);
419 DP(RINT "XD3_DEFAULT_WINSIZE=%d\n", XD3_DEFAULT_WINSIZE); 419 DP(RINT "XD3_DEFAULT_WINSIZE=%d\n", XD3_DEFAULT_WINSIZE);
420 DP(RINT "XD3_HARDMAXWINSIZE=%d\n", XD3_HARDMAXWINSIZE); 420 DP(RINT "XD3_HARDMAXWINSIZE=%d\n", XD3_HARDMAXWINSIZE);
421 DP(RINT "sizeof(void*)=%ld\n", sizeof(void*)); 421 DP(RINT "sizeof(void*)=%d\n", sizeof(void*));
422 DP(RINT "sizeof(int)=%ld\n", sizeof(int)); 422 DP(RINT "sizeof(int)=%d\n", sizeof(int));
423 DP(RINT "sizeof(uint32_t)=%ld\n", sizeof(uint32_t)); 423 DP(RINT "sizeof(uint32_t)=%d\n", sizeof(uint32_t));
424 DP(RINT "sizeof(uint64_t)=%ld\n", sizeof(uint64_t)); 424 DP(RINT "sizeof(uint64_t)=%d\n", sizeof(uint64_t));
425 DP(RINT "sizeof(usize_t)=%ld\n", sizeof(usize_t)); 425 DP(RINT "sizeof(usize_t)=%d\n", sizeof(usize_t));
426 DP(RINT "sizeof(xoff_t)=%ld\n", sizeof(xoff_t)); 426 DP(RINT "sizeof(xoff_t)=%d\n", sizeof(xoff_t));
427 427
428 return EXIT_SUCCESS; 428 return EXIT_SUCCESS;
429} 429}
@@ -2764,7 +2764,7 @@ main_get_appheader_params (main_file *file, char **parsed,
2764 * Possibly the name header is bad, should be off by default. 2764 * Possibly the name header is bad, should be off by default.
2765 * Possibly we just want to remember external/compression 2765 * Possibly we just want to remember external/compression
2766 * settings. */ 2766 * settings. */
2767 char *last_slash = strrchr(other->filename, '/'); 2767 const char *last_slash = strrchr(other->filename, '/');
2768 2768
2769 if (last_slash != NULL) { 2769 if (last_slash != NULL) {
2770 usize_t dlen = (usize_t) (last_slash - other->filename); 2770 usize_t dlen = (usize_t) (last_slash - other->filename);
@@ -4149,7 +4149,7 @@ main (int argc, char **argv)
4149 } 4149 }
4150 while (my_optstr) 4150 while (my_optstr)
4151 { 4151 {
4152 char *s; 4152 const char *s;
4153 my_optarg = NULL; 4153 my_optarg = NULL;
4154 if ((ret = *my_optstr++) == 0) { my_optind += 1; goto takearg; } 4154 if ((ret = *my_optstr++) == 0) { my_optind += 1; goto takearg; }
4155 4155
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h
index 94e25f1..d3241de 100644
--- a/xdelta3/xdelta3-test.h
+++ b/xdelta3/xdelta3-test.h
@@ -203,7 +203,7 @@ static void
203test_unlink (char* file) 203test_unlink (char* file)
204{ 204{
205 char buf[TESTBUFSIZE]; 205 char buf[TESTBUFSIZE];
206 while (_unlink (file) != 0) 206 while (unlink (file) != 0)
207 { 207 {
208 if (errno == ENOENT) 208 if (errno == ENOENT)
209 { 209 {