projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp://ftp.linux.ncsu.edu/mirror/ftp.redhat.com/pub/redhat/linux/enterprise/4/en/os...
[xscreensaver]
/
hacks
/
glx
/
extrusion-taper.c
diff --git
a/hacks/glx/extrusion-taper.c
b/hacks/glx/extrusion-taper.c
index 8cf51cae5ae016dc44b7a391117e08daa55d2625..8aa07ab0a03752b70d437f6c64d40f60d3f37d4b 100644
(file)
--- a/
hacks/glx/extrusion-taper.c
+++ b/
hacks/glx/extrusion-taper.c
@@
-12,11
+12,19
@@
*/
/* required include files */
*/
/* required include files */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <math.h>
#include <stdlib.h>
#include <GL/gl.h>
#include <math.h>
#include <stdlib.h>
#include <GL/gl.h>
-#include <GL/glut.h>
+/*#include <GL/glut.h>*/
+#ifdef HAVE_GLE3
+#include <GL/gle.h>
+#else
#include <GL/tube.h>
#include <GL/tube.h>
+#endif
#ifndef NULL
#define NULL ((void *) 0x0)
#ifndef NULL
#define NULL ((void *) 0x0)
@@
-47,8
+55,8
@@
#define NUM_PTS (25)
#define NUM_PTS (25)
-double contour [NUM_PTS][2];
-double norms [NUM_PTS][2];
+
static
double contour [NUM_PTS][2];
+
static
double norms [NUM_PTS][2];
static void init_contour (void)
{
static void init_contour (void)
{
@@
-86,11
+94,11
@@
static void init_contour (void)
/* =========================================================== */
#define PSIZE 40
/* =========================================================== */
#define PSIZE 40
-double path[PSIZE][3];
-double twist[PSIZE];
-double taper[PSIZE];
+
static
double path[PSIZE][3];
+
static
double twist[PSIZE];
+
static
double taper[PSIZE];
-void init_taper (void) {
+
static
void init_taper (void) {
int j;
double z, deltaz;
double ang, dang;
int j;
double z, deltaz;
double ang, dang;
@@
-143,7
+151,7
@@
void InitStuff_taper (void)
/* =========================================================== */
/* =========================================================== */
-void gleTaper (int ncp,
+
static
void gleTaper (int ncp,
gleDouble contour[][2],
gleDouble cont_normal[][2],
gleDouble up[3],
gleDouble contour[][2],
gleDouble cont_normal[][2],
gleDouble up[3],