diff --git a/src/modules/image/Makefile.src b/src/modules/image/Makefile.src index 3f7cb23d3ef031026bf8165a639288e114cd9dd8..f11360fefe714914f5ed7f5b77a976a693e78f87 100644 --- a/src/modules/image/Makefile.src +++ b/src/modules/image/Makefile.src @@ -4,7 +4,7 @@ PREFLAGS=$(DEFINES) -I$(SRCDIR) -I$(SRCDIR)/../.. -I../.. CFLAGS=$(PREFLAGS) $(OTHERFLAGS) @DEFS@ FILES = image.o font.o quant.o lzw.o togif.o matrix.o pnm.o blit.o \ - pattern.o dct.o + pattern.o # dct.o image.a: $(FILES) -rm -f image.a diff --git a/src/modules/image/image.c b/src/modules/image/image.c index 6c346c1b6dd67f901823350a1f816c64a4c012e3..4a51b6d09ada4eb1e228244d1f06f374f055353e 100644 --- a/src/modules/image/image.c +++ b/src/modules/image/image.c @@ -1,4 +1,4 @@ -/* $Id: image.c,v 1.29 1996/12/01 00:01:13 law Exp $ */ +/* $Id: image.c,v 1.30 1996/12/02 07:04:15 hubbe Exp $ */ #include "global.h" @@ -7,7 +7,7 @@ #include "stralloc.h" #include "global.h" -RCSID("$Id: image.c,v 1.29 1996/12/01 00:01:13 law Exp $"); +RCSID("$Id: image.c,v 1.30 1996/12/02 07:04:15 hubbe Exp $"); #include "types.h" #include "macros.h" #include "object.h" @@ -1630,8 +1630,13 @@ void init_image_programs() add_function("turbulence",image_turbulence, "function(array(float|int|array(int)),int|void,float|void,float|void,float|void,float|void:object)",0); +#if 0 + /* If you check this in, maybe you should chekin dct.c too? + * /Hubbe + */ add_function("dct",image_dct, "function(:object)",0); +#endif set_init_callback(init_image_struct); set_exit_callback(exit_image_struct); diff --git a/src/modules/ssleay/ssleay.c b/src/modules/ssleay/ssleay.c index eb29df07f615b9ed3aa01847b3a03e6d8470fdff..83e296463017121b28a445fbffd078766f0cd034 100644 --- a/src/modules/ssleay/ssleay.c +++ b/src/modules/ssleay/ssleay.c @@ -5,7 +5,7 @@ \*/ #include "global.h" -RCSID("$Id: ssleay.c,v 1.2 1996/12/01 19:51:12 grubba Exp $"); +RCSID("$Id: ssleay.c,v 1.3 1996/12/02 07:04:34 hubbe Exp $"); #include "types.h" #include "interpret.h" #include "svalue.h" @@ -192,23 +192,31 @@ void init_connection(struct object *o) void exit_connection(struct object *o) {} +#endif + void init_ssleay_efuns(void) { +#if 0 + /* This is not only not needed, it will never work since + * ssleay_create is a method which tries to access fp->current_storage. + * /Fredrik Hubinette + */ add_efun("ssleay", ssleay_create, "function(void:object)", 0); +#endif } void exit_ssleay() { +#ifdef HAVE_SSLEAY free_program(ssleay_connection_program); free_program(ssleay_program); +#endif } -#endif /* HAVE_SSLEAY */ - void init_ssleay_programs(void) { - start_new_program(); #ifdef HAVE_SSLEAY + start_new_program(); add_storage(sizeof(struct ssleay_context)); add_function("use_certificate_file", ssleay_use_certificate_file, "function(string:void)", 0); @@ -217,13 +225,11 @@ void init_ssleay_programs(void) set_init_callback(init_context); set_exit_callback(exit_context); -#endif /* HAVE_SSLEAY */ ssleay_program=end_c_program("/precompiled/ssleay"); ssleay_program->refs++; start_new_program(); -#ifdef HAVE_SSLEAY add_storage(sizeof(struct ssleay_connection)); add_function("create", ssleay_connection_create, "function(int:void)",0); @@ -233,9 +239,10 @@ void init_ssleay_programs(void) add_function("set_fd",ssleay_connection_set_fd,"function(int:void)",0); set_init_callback(init_connection); set_exit_callback(exit_connection); -#endif /* HAVE_SSLEAY */ + ssleay_connection_program=end_c_program("/precompiled/ssleay_connection"); ssleay_connection_program->refs++; +#endif /* HAVE_SSLEAY */ }