diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-04-16 20:25:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-04-16 20:25:08 +1000 |
| commit | 09df5eaff2ba2694b82d1211fd24410cb2997e25 (patch) | |
| tree | 0028ffd43d1895bb9e7d1ab0f5906629b0fa4825 /progs/xdemos/ipc.c | |
| parent | 9566cf0e2f326d8fe638748d0bc10626e8c0387e (diff) | |
| parent | b64448b3e4026d3f11f366515b7544a6581403f3 (diff) | |
Merge branch 'master' into r500test
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_ioctl.c
Diffstat (limited to 'progs/xdemos/ipc.c')
| -rw-r--r-- | progs/xdemos/ipc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/xdemos/ipc.c b/progs/xdemos/ipc.c index fa52b09076..c872d1641a 100644 --- a/progs/xdemos/ipc.c +++ b/progs/xdemos/ipc.c @@ -27,12 +27,12 @@ #include <assert.h> #include <stdio.h> #include <string.h> +#include <sys/types.h> #include <netinet/in.h> #include <netinet/tcp.h> #include <arpa/inet.h> #include <netdb.h> #include <unistd.h> -#include <sys/types.h> #include <sys/socket.h> #include "ipc.h" |