git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/sideband.h b/sideband.h
index c645cf2c521f3153d353ab0466607adeaa1d4498..a84b6917c7a17b5f8a922540801e98d46aa24431 100644 (file)
--- a/sideband.h
+++ b/sideband.h
@@ -5,8 +5,9 @@
 #define SIDEBAND_REMOTE_ERROR -1
 
 #define DEFAULT_PACKET_MAX 1000
+#define LARGE_PACKET_MAX 65520
 
-int recv_sideband(const char *me, int in_stream, int out, int err, char *, int);
+int recv_sideband(const char *me, int in_stream, int out, int err);
 ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max);
 
 #endif