commit 35d7a26c61a4db831b32d21fa50bd0a957bfa0ff
author Robbie Shade <rjshade@google.com> Tue Oct 04 16:39:39 2016 -0400
committer Robbie Shade <rjshade@google.com> Tue Oct 04 16:39:39 2016 -0400
tree 48025170d2df50df0a216b77fb39ffe67ba20f04
parent 26f90888d6d98322974a75dc8938dc070edea4c5
parent db1f7bc012d570b5909ee911b762a7968e857aea

Merge branch 'master' into enable_udp_testing

src/core/lib/iomgr/udp_server.c

diff --git a/src/core/lib/iomgr/udp_server.c b/src/core/lib/iomgr/udp_server.c
index 12e929f..df68402 100644
--- a/src/core/lib/iomgr/udp_server.c
+++ b/src/core/lib/iomgr/udp_server.c
@@ -38,7 +38,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GRPC_NEED_UDP
 #ifdef GPR_POSIX_SOCKET
 
 #include "src/core/lib/iomgr/udp_server.h"
@@ -446,4 +445,3 @@
 }
 
 #endif
-#endif

test/core/iomgr/udp_server_test.c

diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c
index a959a7e..2a304275 100644
--- a/test/core/iomgr/udp_server_test.c
+++ b/test/core/iomgr/udp_server_test.c
@@ -48,8 +48,6 @@
 #include "src/core/lib/iomgr/iomgr.h"
 #include "test/core/util/test_config.h"
 
-#ifdef GRPC_NEED_UDP
-
 #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", #x)
 
 static grpc_pollset *g_pollset;
@@ -229,9 +227,3 @@
   grpc_iomgr_shutdown();
   return 0;
 }
-
-#else
-
-int main(int argc, char **argv) { return 0; }
-
-#endif