1 files changed, 21 insertions, 10 deletions

diff --git a/src/cgm.c b/src/cgm.c
index c0bcac4..bf9ae1f 100644
--- a/src/cgm.c
+++ b/src/cgm.c
@@ -2,6 +2,10 @@
 
 #include "cd/cd.h"
 
+struct CGMc_struct;
+static void (*CGMc_default_constructor)(struct CGMc_struct *);
+static void (*CGMc_default_destructor)(struct CGMc_struct *);
+
 OBJECT(CGMc,
 	int r;
 	int g;
@@ -9,8 +13,15 @@ OBJECT(CGMc,
 	int n;
 );
 
-CONSTRUCTOR(CGMc)=GObj_DefaultConstructor;
-DESTRUCTOR(CGMc)=GObj_DefaultDestructor;
+
+static CONSTRUCTOR(CGMc)=GObj_DefaultConstructor;
+static DESTRUCTOR(CGMc)=GObj_DefaultDestructor;
+
+
+
+struct Private_struct;
+static void (*Private_default_constructor)(struct Private_struct *);
+static void (*Private_default_destructor)(struct Private_struct *);
 	
 OBJECT(Private, 
 	CGMc_list  cgmcs;
@@ -22,10 +33,10 @@ OBJECT(Private,
 static void private_constructor(Private);
 static void private_destructor(Private);
 
-CONSTRUCTOR(Private)=private_constructor;
-DESTRUCTOR(Private)=private_destructor;
+static CONSTRUCTOR(Private)=private_constructor;
+static DESTRUCTOR(Private)=private_destructor;
 
-int cgm_sortout_color(Private p,int r,int g,int b)
+static int cgm_sortout_color(Private p,int r,int g,int b)
 {
 CGMc c;
 
@@ -78,7 +89,7 @@ free(p);
 
 	
 
-void cgm_init_private(Handle h) 
+INTERNAL void cgm_init_private(Handle h) 
 {
 Private p;
 
@@ -91,7 +102,7 @@ h->private=(void *) p;
 
 
 
-void cgm_do_line(Handle h,Jwgline *line) 
+INTERNAL void cgm_do_line(Handle h,Jwgline *line) 
 {
 Private p=(Private) h->private;
 int i,c;
@@ -133,7 +144,7 @@ free(base);
 
 }
 
-void cgm_init_xform(Handle h)
+INTERNAL void cgm_init_xform(Handle h)
 {
 /* this should map 1000,1414.21 to an A4 page */
 
@@ -148,7 +159,7 @@ h->transform.c=0.0;
 
 }
 
-void cgm_do_poly(Handle h,Jwgline *line) 
+INTERNAL void cgm_do_poly(Handle h,Jwgline *line) 
 {
 int i,c;
 int r,g,b;
@@ -181,7 +192,7 @@ free(base);
 }
 
 
-void cgm_do_text(Handle h,Jwgpos pos,char *str) 
+INTERNAL void cgm_do_text(Handle h,Jwgpos pos,char *str) 
 {
 int color,r,g,b;
 Transform t=h->transform;