summaryrefslogtreecommitdiff
path: root/xdelta3
diff options
context:
space:
mode:
authorJosh MacDonald <josh.macdonald@gmail.com>2016-01-07 22:43:21 -0800
committerJosh MacDonald <josh.macdonald@gmail.com>2016-01-07 22:43:21 -0800
commit54b3937e71a6c3a186c38993300908019b1cb335 (patch)
tree3120092c16a841815e98ce03a3df96d572f19c2b /xdelta3
parent0c692e6a1a9809bb20a5a805517ccc183b4bc8d5 (diff)
parent2a30911b29810a0c7024a60d892a01a321b67823 (diff)
Merge remote-tracking branch 'origin/master' into 64bithash
Diffstat (limited to 'xdelta3')
-rw-r--r--xdelta3/testing/file.h3
-rw-r--r--xdelta3/xdelta3.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/xdelta3/testing/file.h b/xdelta3/testing/file.h
index eb40e51..05e6441 100644
--- a/xdelta3/testing/file.h
+++ b/xdelta3/testing/file.h
@@ -315,7 +315,8 @@ public:
315 static int static_counter = 0; 315 static int static_counter = 0;
316 pid_t pid = getpid(); 316 pid_t pid = getpid();
317 char buf[64]; 317 char buf[64];
318 snprintf(buf, 64, "/tmp/regtest.%d.%d", pid, static_counter++); 318 xoff_t xpid = pid;
319 snprintf(buf, 64, "/tmp/regtest.%"Q"u.%d", xpid, static_counter++);
319 filename_.append(buf); 320 filename_.append(buf);
320 unlink(filename_.c_str()); 321 unlink(filename_.c_str());
321 } 322 }
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 2046fe5..0c1ae0d 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -1,6 +1,5 @@
1/* xdelta 3 - delta compression tools and library 1/* xdelta 3 - delta compression tools and library
2 * Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, 2 * Copyright (C) Joshua P. MacDonald
3 * 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. Joshua P. MacDonald
4 * 3 *
5 * This program is free software; you can redistribute it and/or modify 4 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by