On Sat, Nov 14, 2020 at 12:13:24AM +0100, Christian Weisgerber wrote:
> diff_output_edscript.c needs an include for uint8_t, as can been seen
> when trying to build the new diff code on FreeBSD.
> 
> The other files mostly use <inttypes.h>, so we could go with that.
> Or we could move them all to <stdint.h>, since none of the additional
> features of inttypes.h are used at all.

Either way is fine with me.

Note that most of these files are inherited from diff.git and should
be fixed there, then synced to Got. What I would do is copy the files
over from diff.git to got and commit them with a message such as
'sync files from diff.git $commit_hash'

You should have access to the diff.git repository already.

> diff ab378e1f5dfdd34727e7eb8a2ccb8c6d42bc6e89 /home/naddy/diff
> blob - 26e0568cfba8a9d74e2f9e1ee65261383fe2e9b5
> file + diff/diff.c
> --- diff/diff.c
> +++ diff/diff.c
> @@ -22,7 +22,7 @@
>  
>  #include <err.h>
>  #include <fcntl.h>
> -#include <inttypes.h>
> +#include <stdint.h>
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <stdbool.h>
> blob - a3d25db09a7170f984d78db4fa9d4de2a904607a
> file + lib/diff_atomize_text.c
> --- lib/diff_atomize_text.c
> +++ lib/diff_atomize_text.c
> @@ -16,8 +16,8 @@
>   */
>  
>  #include <errno.h>
> -#include <inttypes.h>
>  #include <stdbool.h>
> +#include <stdint.h>
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <unistd.h>
> blob - a286036a2ee2b4911b7aa95172020f4192c56f5d
> file + lib/diff_myers.c
> --- lib/diff_myers.c
> +++ lib/diff_myers.c
> @@ -17,8 +17,8 @@
>   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>   */
>  
> -#include <inttypes.h>
>  #include <stdbool.h>
> +#include <stdint.h>
>  #include <stdlib.h>
>  #include <string.h>
>  #include <stdio.h>
> blob - 92c42e1de1fdc900fa3a3e8cb4cbc92cacb295c7
> file + lib/diff_output.c
> --- lib/diff_output.c
> +++ lib/diff_output.c
> @@ -17,8 +17,8 @@
>  
>  #include <ctype.h>
>  #include <errno.h>
> -#include <inttypes.h>
>  #include <stdbool.h>
> +#include <stdint.h>
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <string.h>
> blob - b6e9089caf74f10a59526427cb0c2b8d1fa47a03
> file + lib/diff_output_edscript.c
> --- lib/diff_output_edscript.c
> +++ lib/diff_output_edscript.c
> @@ -17,6 +17,7 @@
>   */
>  
>  #include <errno.h>
> +#include <stdint.h>
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <stdbool.h>
> blob - cc478ba4dd635825a2cf8235364f9ddcebb2f6aa
> file + lib/diff_output_plain.c
> --- lib/diff_output_plain.c
> +++ lib/diff_output_plain.c
> @@ -16,7 +16,7 @@
>   */
>  
>  #include <errno.h>
> -#include <inttypes.h>
> +#include <stdint.h>
>  #include <stdio.h>
>  #include <stdbool.h>
>  #include <stdlib.h>
> blob - 96cecead506011705d8c2e6b3e6c4487fee709a2
> file + lib/diff_output_unidiff.c
> --- lib/diff_output_unidiff.c
> +++ lib/diff_output_unidiff.c
> @@ -16,8 +16,8 @@
>   */
>  
>  #include <errno.h>
> -#include <inttypes.h>
>  #include <stdbool.h>
> +#include <stdint.h>
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <assert.h>
> blob - 6fcac654d42e60add575f4927506202f226e0ea3
> file + lib/diff_patience.c
> --- lib/diff_patience.c
> +++ lib/diff_patience.c
> @@ -18,9 +18,9 @@
>   */
>  
>  #include <assert.h>
> -#include <inttypes.h>
>  #include <errno.h>
>  #include <stdbool.h>
> +#include <stdint.h>
>  #include <stdio.h>
>  #include <stdlib.h>
>  
> -- 
> Christian "naddy" Weisgerber                          naddy@mips.inka.de
> 
>