Merge remote branch 'origin/master' into gallium_draw_llvm

[mesa.git] / progs / rbug / simple_server.c

diff --git a/progs/rbug/simple_server.c b/progs/rbug/simple_server.c
index 04380c33109692a70b04917730ab604915592942..3a842c06c4e020fe110d0033f7ecae8c3b2da4f7 100644 (file)
--- a/progs/rbug/simple_server.c
+++ b/progs/rbug/simple_server.c
@@ -29,7 +29,7 @@
 
 #include "rbug/rbug.h"
 
-static void wait()
+static void rbug_wait()
 {
    int s = u_socket_listen_on_port(13370);
    int c = u_socket_accept(s);
@@ -57,6 +57,6 @@ static void wait()
 
 int main(int argc, char** argv)
 {
-   wait();
+   rbug_wait();
    return 0;
 }