Mesa (mesa_7_7_branch): progs/rbug: s/wait/rbug_wait/
Vinson Lee
vlee at kemper.freedesktop.org
Sat Jan 2 00:28:00 UTC 2010
Module: Mesa
Branch: mesa_7_7_branch
Commit: ad9defdd9c5c7a18c833cdacebe012604190f167
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad9defdd9c5c7a18c833cdacebe012604190f167
Author: Vinson Lee <vlee at vmware.com>
Date: Fri Jan 1 16:25:37 2010 -0800
progs/rbug: s/wait/rbug_wait/
wait conflicts with wait in /usr/include/sys/wait.h.
---
progs/rbug/simple_server.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/progs/rbug/simple_server.c b/progs/rbug/simple_server.c
index 04380c3..3a842c0 100644
--- 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;
}
More information about the mesa-commit
mailing list