Merge tag 'upstream/3.3.3'

[debian/amanda] / xfer-src / xfer.h

diff --git a/xfer-src/xfer.h b/xfer-src/xfer.h
index 3d6773a02f969d3684ce91f64282c177747d3389..48d8583d69b94585793c5276311c6e53aea23c7e 100644 (file)
--- a/xfer-src/xfer.h
+++ b/xfer-src/xfer.h
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2008-2012 Zmanda, Inc.  All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -90,6 +91,8 @@ struct Xfer {
     /* Used to coordinate handing off file descriptors among elements of this
      * xfer */
     GMutex *fd_mutex;
+
+    int cancelled;
 };
 
 typedef struct Xfer Xfer;