diff options
author | Ian Romanick <[email protected]> | 2009-12-15 12:38:01 -0800 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2009-12-15 12:38:01 -0800 |
commit | 11522b74b318db9d099466ff226124c23595e8e2 (patch) | |
tree | 2f57b1d594a9f6c223b002f1c549ea5f799b37cc /progs/redbook/aaindex.c | |
parent | b90f7f3ad324b1e4c39e334cdeb9556c3eb808ab (diff) | |
parent | f23d01e726a57cd6b8e31f1049ee5853773df7ea (diff) |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/gallium/drivers/softpipe/sp_quad_blend.c
Diffstat (limited to 'progs/redbook/aaindex.c')
-rw-r--r-- | progs/redbook/aaindex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/progs/redbook/aaindex.c b/progs/redbook/aaindex.c index 7dbc7b4b9b2..6011ec44b67 100644 --- a/progs/redbook/aaindex.c +++ b/progs/redbook/aaindex.c @@ -56,7 +56,7 @@ static float rotAngle = 0.; * at RAMP1START, and a blue color ramp starting * at RAMP2START. The ramps must be a multiple of 16. */ -void init(void) +static void init(void) { int i; @@ -76,7 +76,7 @@ void init(void) /* Draw 2 diagonal lines to form an X */ -void display(void) +static void display(void) { glClear(GL_COLOR_BUFFER_BIT); @@ -101,7 +101,7 @@ void display(void) glFlush(); } -void reshape(int w, int h) +static void reshape(int w, int h) { glViewport(0, 0, (GLsizei) w, (GLsizei) h); glMatrixMode(GL_PROJECTION); @@ -117,7 +117,7 @@ void reshape(int w, int h) } /* ARGSUSED1 */ -void keyboard(unsigned char key, int x, int y) +static void keyboard(unsigned char key, int x, int y) { switch (key) { case 'r': |