diff options
| author | Brian Paul <[email protected]> | 2009-12-21 18:35:54 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-12-21 18:35:54 -0700 |
| commit | 9eb7fc6661a1d46c06cec8584b898e3e690af6fa (patch) | |
| tree | 78ed4336c613303ef02691baf4d89e7330a0f6cf /progs/redbook/quadric.c | |
| parent | ae1c0a06e81b8c6f015a3b64616a5d3a989f9373 (diff) | |
| parent | b57abd3bea29e95e5dee2524c3f1be4b26017c0f (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
Diffstat (limited to 'progs/redbook/quadric.c')
| -rw-r--r-- | progs/redbook/quadric.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/progs/redbook/quadric.c b/progs/redbook/quadric.c index 7e99098304a..1cbd395e47b 100644 --- a/progs/redbook/quadric.c +++ b/progs/redbook/quadric.c @@ -54,7 +54,7 @@ GLuint startList; -void CALLBACK errorCallback(GLenum errorCode) +static void CALLBACK errorCallback(GLenum errorCode) { const GLubyte *estring; @@ -63,7 +63,7 @@ void CALLBACK errorCallback(GLenum errorCode) exit(0); } -void init(void) +static void init(void) { GLUquadricObj *qobj; GLfloat mat_ambient[] = { 0.5, 0.5, 0.5, 1.0 }; @@ -120,7 +120,7 @@ void init(void) gluDeleteQuadric(qobj); } -void display(void) +static void display(void) { glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glPushMatrix(); @@ -150,7 +150,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); @@ -166,7 +166,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 27: |