diff options
| author | Brian Paul <[email protected]> | 2010-01-04 19:16:24 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-01-04 19:16:24 -0700 |
| commit | 5ac16495a2772886100789f04e1a7d65068e9a40 (patch) | |
| tree | 3a387294b977841ac4255ff8fbfedd1ce2dc8946 /progs/rbug | |
| parent | bfc34c880492f15dc47db30e88f888d1c48d5e70 (diff) | |
| parent | 6d845808589b9df84f23551b122533a55dce6bd5 (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
docs/relnotes.html
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/r300/r300_cs.h
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/enums.c
Diffstat (limited to 'progs/rbug')
| -rw-r--r-- | 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 04380c33109..3a842c06c4e 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; } |