Merge branch 'master' into jc/web

diff --git a/pkt-line.h b/pkt-line.h
index 51d0cbe219f2f45bf3920441f09dfcc2744adb06..9df653f6f5afe720870658d7093bddbf3e66beaf 100644 (file)
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -1,6 +1,8 @@
 #ifndef PKTLINE_H
 #define PKTLINE_H
 
+#include "git-compat-util.h"
+
 /*
  * Silly packetized line writing interface
  */
@@ -8,5 +10,6 @@ void packet_flush(int fd);
 void packet_write(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
 
 int packet_read_line(int fd, char *buffer, unsigned size);
+ssize_t safe_write(int, const void *, ssize_t);
 
 #endif