Merge remote-tracking branch 'origin/master' into 64bithash

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:
     static int static_counter = 0;
     pid_t pid = getpid();
     char buf[64];
-    snprintf(buf, 64, "/tmp/regtest.%d.%d", pid, static_counter++);
+    xoff_t xpid = pid;
+    snprintf(buf, 64, "/tmp/regtest.%"Q"u.%d", xpid, static_counter++);
     filename_.append(buf);
     unlink(filename_.c_str());
   }
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 @@
 /* xdelta 3 - delta compression tools and library
- * Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007,
- * 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015.  Joshua P. MacDonald
+ * Copyright (C) Joshua P. MacDonald
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by