From 61e6725335fbba86175ec770c1e94c5f60e76d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 16 Aug 2016 09:23:55 +0200
Subject: [PATCH 1/4] Include <stdint.h> in cf-lex.l to avoid UINTx_MAX
 redefinition

---
 conf/cf-lex.l | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 727dc017..61ea4527 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -30,6 +30,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <libgen.h>
 #include <glob.h>

From 33d22f0e9e79c387c492d1cf16bdb723ca1d588a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 16 Aug 2016 09:24:12 +0200
Subject: [PATCH 2/4] whitespace fixes

---
 filter/filter.c  | 2 +-
 filter/tree.c    | 4 ++--
 sysdep/unix/io.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/filter/filter.c b/filter/filter.c
index 30571e5a..ccdfed36 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -185,7 +185,7 @@ pm_same(struct f_path_mask *m1, struct f_path_mask *m2)
     m2 = m2->next;
   }
 
- return !m1 && !m2;
+  return !m1 && !m2;
 }
 
 /**
diff --git a/filter/tree.c b/filter/tree.c
index ee9f448a..59ebf579 100644
--- a/filter/tree.c
+++ b/filter/tree.c
@@ -163,9 +163,9 @@ tree_format(struct f_tree *t, buffer *buf)
 {
   buffer_puts(buf, "[");
  
- tree_node_format(t, buf);
+  tree_node_format(t, buf);
 
- /* Undo last separator */
+  /* Undo last separator */
   if (buf->pos[-1] != '[')
     buf->pos -= 2;
  
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 8198743d..120eb906 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2235,7 +2235,7 @@ io_loop(void)
 	      if (pfd[s->index].revents & (POLLHUP | POLLERR))
 		{
 		  sk_err(s, pfd[s->index].revents);
-		    goto next2;
+		  goto next2;
 		}
 
 	      current_sock = sk_next(s);

From 671ddd5b05cf35b2ab7b80f1d13641c875f22e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 16 Aug 2016 09:25:50 +0200
Subject: [PATCH 3/4] Add .gitignore to ignore generated files

---
 .gitignore | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..77dea498
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+/Makefile
+/bird
+/birdc
+/birdcl
+/config.log
+/config.status
+/configure
+/obj/

From d107ef78df2564cba75af1a6dcc9894c4468b207 Mon Sep 17 00:00:00 2001
From: Pavel Tvrdik <pawel.tvrdik@gmail.com>
Date: Tue, 16 Aug 2016 13:02:32 +0200
Subject: [PATCH 4/4] Whitespace fixes

---
 lib/printf.c    | 2 +-
 nest/rt-table.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/printf.c b/lib/printf.c
index a067fe98..4fd75c9b 100644
--- a/lib/printf.c
+++ b/lib/printf.c
@@ -169,7 +169,7 @@ int bvsnprintf(char *buf, int size, const char *fmt, va_list args)
 				case ' ': flags |= SPACE; goto repeat;
 				case '#': flags |= SPECIAL; goto repeat;
 				case '0': flags |= ZEROPAD; goto repeat;
-				}
+			}
 		
 		/* get field width */
 		field_width = -1;
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 50c01c88..9baf2849 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1777,7 +1777,7 @@ rt_next_hop_update_net(rtable *tab, net *n)
   /* FIXME: Better announcement of merged routes */
   rte_announce_i(tab, RA_MERGED, n, new, old_best, new, old_best);
 
-   if (free_old_best)
+  if (free_old_best)
     rte_free_quick(old_best);
 
   return count;