From 6ad2b6c950189f80a55741663091e165cce034b8 Mon Sep 17 00:00:00 2001
From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Sun, 18 May 2003 00:26:59 +0000
Subject: [PATCH] trying to fix undefined symbol problems people are having

---
 lib/buffer.c       | 32 +++++++++---------
 lib/calib.c        | 12 +++----
 lib/calib_yacc.y   |  8 ++---
 lib/cmd.c          |  8 ++---
 lib/comedi.c       | 48 +++++++++++++--------------
 lib/data.c         | 20 +++++------
 lib/dio.c          | 16 ++++-----
 lib/error.c        | 16 ++++-----
 lib/get.c          | 56 +++++++++++++++----------------
 lib/range.c        | 32 +++++++++---------
 lib/sv.c           | 12 +++----
 lib/timed.c        |  4 +--
 lib/timer.c        |  4 +--
 lib/version_script | 83 +++++++++++++++++++++++++++++++++++++++-------
 14 files changed, 205 insertions(+), 146 deletions(-)

diff --git a/lib/buffer.c b/lib/buffer.c
index dcfe931..4b89542 100644
--- a/lib/buffer.c
+++ b/lib/buffer.c
@@ -24,8 +24,8 @@
 #include "libinternal.h"
 #include <string.h>
 
-EXPORT_SYMBOL(comedi_set_buffer_size,0.7.18);
-int comedi_set_buffer_size(comedi_t *it, unsigned int subdev, unsigned int size)
+EXPORT_ALIAS_DEFAULT(_comedi_set_buffer_size,comedi_set_buffer_size,0.7.18);
+int _comedi_set_buffer_size(comedi_t *it, unsigned int subdev, unsigned int size)
 {
 	int ret;
 	comedi_bufconfig bc;
@@ -40,8 +40,8 @@ int comedi_set_buffer_size(comedi_t *it, unsigned int subdev, unsigned int size)
 	return bc.size;
 }
 
-EXPORT_SYMBOL(comedi_set_max_buffer_size,0.7.18);
-int comedi_set_max_buffer_size(comedi_t *it, unsigned int subdev, unsigned int max_size)
+EXPORT_ALIAS_DEFAULT(_comedi_set_max_buffer_size,comedi_set_max_buffer_size,0.7.18);
+int _comedi_set_max_buffer_size(comedi_t *it, unsigned int subdev, unsigned int max_size)
 {
 	int ret;
 	comedi_bufconfig bc;
@@ -56,26 +56,26 @@ int comedi_set_max_buffer_size(comedi_t *it, unsigned int subdev, unsigned int m
 	return bc.maximum_size;
 }
 
-EXPORT_SYMBOL(comedi_get_max_buffer_size,0.7.18);
-int comedi_get_max_buffer_size(comedi_t *it, unsigned int subdevice)
+EXPORT_ALIAS_DEFAULT(_comedi_get_max_buffer_size,comedi_get_max_buffer_size,0.7.18);
+int _comedi_get_max_buffer_size(comedi_t *it, unsigned int subdevice)
 {
 	return comedi_set_max_buffer_size(it, subdevice, 0);
 }
 
-EXPORT_SYMBOL(comedi_get_buffer_size,0.7.18);
-int comedi_get_buffer_size(comedi_t *it, unsigned int subdev)
+EXPORT_ALIAS_DEFAULT(_comedi_get_buffer_size,comedi_get_buffer_size,0.7.18);
+int _comedi_get_buffer_size(comedi_t *it, unsigned int subdev)
 {
 	return comedi_set_buffer_size(it, subdev, 0);
 }
 
-EXPORT_SYMBOL(comedi_get_buffer_contents,0.7.18);
-int comedi_get_buffer_contents(comedi_t *it, unsigned int subdev)
+EXPORT_ALIAS_DEFAULT(_comedi_get_buffer_contents,comedi_get_buffer_contents,0.7.18);
+int _comedi_get_buffer_contents(comedi_t *it, unsigned int subdev)
 {
 	return comedi_mark_buffer_read(it, subdev, 0);
 }
 
-EXPORT_SYMBOL(comedi_mark_buffer_read,0.7.18);
-int comedi_mark_buffer_read(comedi_t *it, unsigned int subdev, unsigned int bytes)
+EXPORT_ALIAS_DEFAULT(_comedi_mark_buffer_read,comedi_mark_buffer_read,0.7.18);
+int _comedi_mark_buffer_read(comedi_t *it, unsigned int subdev, unsigned int bytes)
 {
 	int ret;
 	comedi_bufinfo bi;
@@ -88,8 +88,8 @@ int comedi_mark_buffer_read(comedi_t *it, unsigned int subdev, unsigned int byte
 	return bi.buf_int_count - bi.buf_user_count;
 }
 
-EXPORT_SYMBOL(comedi_get_buffer_offset,0.7.18);
-int comedi_get_buffer_offset(comedi_t *it, unsigned int subdev)
+EXPORT_ALIAS_DEFAULT(_comedi_get_buffer_offset,comedi_get_buffer_offset,0.7.18);
+int _comedi_get_buffer_offset(comedi_t *it, unsigned int subdev)
 {
 	int ret;
 	comedi_bufinfo bi;
@@ -100,8 +100,8 @@ int comedi_get_buffer_offset(comedi_t *it, unsigned int subdev)
 	return bi.buf_user_ptr;
 }
 
-EXPORT_SYMBOL(comedi_get_front_count,0.7.18);
-int comedi_get_front_count(comedi_t *it, unsigned int subdev)
+EXPORT_ALIAS_DEFAULT(_comedi_get_front_count,comedi_get_front_count,0.7.18);
+int _comedi_get_front_count(comedi_t *it, unsigned int subdev)
 {
 	int ret;
 	comedi_bufinfo bi;
diff --git a/lib/calib.c b/lib/calib.c
index e9beffa..565ac4a 100644
--- a/lib/calib.c
+++ b/lib/calib.c
@@ -148,8 +148,8 @@ static int set_calibration( comedi_t *dev, const comedi_calibration_t *parsed_fi
 	return 0;
 }
 
-EXPORT_SYMBOL(comedi_apply_calibration,0.7.20);
-int comedi_apply_parsed_calibration( comedi_t *dev, unsigned int subdev, unsigned int channel,
+EXPORT_ALIAS_DEFAULT(_comedi_apply_parsed_calibration,comedi_apply_parsed_calibration,0.7.20);
+int _comedi_apply_parsed_calibration( comedi_t *dev, unsigned int subdev, unsigned int channel,
 	unsigned int range, unsigned int aref, const comedi_calibration_t *calibration )
 {
 	int retval;
@@ -161,8 +161,8 @@ int comedi_apply_parsed_calibration( comedi_t *dev, unsigned int subdev, unsigne
 	return retval;
 }
 
-EXPORT_SYMBOL(comedi_get_default_calibration_path,0.7.20);
-char* comedi_get_default_calibration_path( comedi_t *dev )
+EXPORT_ALIAS_DEFAULT(_comedi_get_default_calibration_path,comedi_get_default_calibration_path,0.7.20);
+char* _comedi_get_default_calibration_path( comedi_t *dev )
 {
 	struct stat file_stats;
 	char *file_path;
@@ -191,8 +191,8 @@ char* comedi_get_default_calibration_path( comedi_t *dev )
 	return file_path;
 }
 
-EXPORT_SYMBOL(comedi_apply_calibration,0.7.20);
-int comedi_apply_calibration( comedi_t *dev, unsigned int subdev, unsigned int channel,
+EXPORT_ALIAS_DEFAULT(_comedi_apply_calibration,comedi_apply_calibration,0.7.20);
+int _comedi_apply_calibration( comedi_t *dev, unsigned int subdev, unsigned int channel,
 	unsigned int range, unsigned int aref, const char *cal_file_path )
 {
 	char file_path[ 1024 ];
diff --git a/lib/calib_yacc.y b/lib/calib_yacc.y
index 4232cbd..c2f1673 100644
--- a/lib/calib_yacc.y
+++ b/lib/calib_yacc.y
@@ -178,8 +178,8 @@ static comedi_calibration_t* alloc_calib_parse( void )
 	return file_contents;
 }
 
-EXPORT_SYMBOL(comedi_cleanup_calibration,0.7.20);
-extern void comedi_cleanup_calibration( comedi_calibration_t *file_contents )
+EXPORT_ALIAS_DEFAULT(_comedi_cleanup_calibration,comedi_cleanup_calibration,0.7.20);
+extern void _comedi_cleanup_calibration( comedi_calibration_t *file_contents )
 {
 	if( file_contents->driver_name )
 	{
@@ -196,8 +196,8 @@ extern void comedi_cleanup_calibration( comedi_calibration_t *file_contents )
 	file_contents = NULL;
 }
 
-EXPORT_SYMBOL(comedi_parse_calibration_file,0.7.20);
-extern comedi_calibration_t* comedi_parse_calibration_file( const char *cal_file_path )
+EXPORT_ALIAS_DEFAULT(_comedi_parse_calibration_file,comedi_parse_calibration_file,0.7.20);
+extern comedi_calibration_t* _comedi_parse_calibration_file( const char *cal_file_path )
 {
 	calib_yyparse_private_t priv;
 	FILE *file;
diff --git a/lib/cmd.c b/lib/cmd.c
index df9c713..7a3c042 100644
--- a/lib/cmd.c
+++ b/lib/cmd.c
@@ -36,8 +36,8 @@
 #include "libinternal.h"
 
 
-EXPORT_SYMBOL(comedi_get_cmd_src_mask,0.7.18);
-int comedi_get_cmd_src_mask(comedi_t *it,unsigned int subd,comedi_cmd *cmd)
+EXPORT_ALIAS_DEFAULT(_comedi_get_cmd_src_mask,comedi_get_cmd_src_mask,0.7.18);
+int _comedi_get_cmd_src_mask(comedi_t *it,unsigned int subd,comedi_cmd *cmd)
 {
 	subdevice *s;
 	int ret;
@@ -156,8 +156,8 @@ static int __generic_timed(comedi_t *it,unsigned int s,
 	return -1;
 }
 
-EXPORT_SYMBOL(comedi_get_cmd_generic_timed,0.7.18);
-int comedi_get_cmd_generic_timed(comedi_t *it,unsigned int subd,comedi_cmd *cmd,
+EXPORT_ALIAS_DEFAULT(_comedi_get_cmd_generic_timed,comedi_get_cmd_generic_timed,0.7.18);
+int _comedi_get_cmd_generic_timed(comedi_t *it,unsigned int subd,comedi_cmd *cmd,
 	unsigned int ns)
 {
 	subdevice *s;
diff --git a/lib/comedi.c b/lib/comedi.c
index a42b27c..5003f79 100644
--- a/lib/comedi.c
+++ b/lib/comedi.c
@@ -48,8 +48,8 @@ INTERNAL void initialize(void)
 	}
 }
   
-EXPORT_SYMBOL(comedi_open,0.7.18);
-comedi_t *comedi_open(const char *fn)
+EXPORT_ALIAS_DEFAULT(_comedi_open,comedi_open,0.7.18);
+comedi_t* _comedi_open(const char *fn)
 {
 	comedi_t *it;
 
@@ -82,8 +82,8 @@ cleanup:
 	return NULL;
 }
 
-EXPORT_SYMBOL(comedi_close,0.7.18);
-int comedi_close(comedi_t *it)
+EXPORT_ALIAS_DEFAULT(_comedi_close,comedi_close,0.7.18);
+int _comedi_close(comedi_t *it)
 {
 	subdevice *s;
 	int i;
@@ -118,20 +118,20 @@ int comedi_close(comedi_t *it)
 	return 0;
 }
 
-EXPORT_SYMBOL(comedi_cancel,0.7.18);
-int comedi_cancel(comedi_t *it,unsigned int subdevice)
+EXPORT_ALIAS_DEFAULT(_comedi_cancel,comedi_cancel,0.7.18);
+int _comedi_cancel(comedi_t *it,unsigned int subdevice)
 {
 	return comedi_ioctl(it->fd,COMEDI_CANCEL,subdevice);
 }
 
-EXPORT_SYMBOL(comedi_poll,0.7.18);
-int comedi_poll(comedi_t *it,unsigned int subdevice)
+EXPORT_ALIAS_DEFAULT(_comedi_poll,comedi_poll,0.7.18);
+int _comedi_poll(comedi_t *it,unsigned int subdevice)
 {
 	return comedi_ioctl(it->fd,COMEDI_POLL,subdevice);
 }
 
-EXPORT_SYMBOL(comedi_fileno,0.7.18);
-int comedi_fileno(comedi_t *it)
+EXPORT_ALIAS_DEFAULT(_comedi_fileno,comedi_fileno,0.7.18);
+int _comedi_fileno(comedi_t *it)
 {
 	if(!it)
 		return -1;
@@ -139,8 +139,8 @@ int comedi_fileno(comedi_t *it)
 	return it->fd;
 }
 
-EXPORT_SYMBOL(comedi_trigger,0.7.18);
-int comedi_trigger(comedi_t *it,comedi_trig *t)
+EXPORT_ALIAS_DEFAULT(_comedi_trigger,comedi_trigger,0.7.18);
+int _comedi_trigger(comedi_t *it,comedi_trig *t)
 {
 	if(!it || !t)
 		return -1;
@@ -148,8 +148,8 @@ int comedi_trigger(comedi_t *it,comedi_trig *t)
 	return comedi_ioctl(it->fd, COMEDI_TRIG, (unsigned long)t);
 }
 
-EXPORT_SYMBOL(comedi_command,0.7.18);
-int comedi_command(comedi_t *it,comedi_cmd *t)
+EXPORT_ALIAS_DEFAULT(_comedi_command,comedi_command,0.7.18);
+int _comedi_command(comedi_t *it,comedi_cmd *t)
 {
 	int ret;
 	ret = comedi_ioctl(it->fd, COMEDI_CMD, (unsigned long)t);
@@ -162,8 +162,8 @@ int comedi_command(comedi_t *it,comedi_cmd *t)
 	return ret;
 }
 
-EXPORT_SYMBOL(comedi_command_test,0.7.18);
-int comedi_command_test(comedi_t *it,comedi_cmd *t)
+EXPORT_ALIAS_DEFAULT(_comedi_command_test,comedi_command_test,0.7.18);
+int _comedi_command_test(comedi_t *it,comedi_cmd *t)
 {
 	int ret;
 	ret = comedi_ioctl(it->fd, COMEDI_CMDTEST, (unsigned long)t);
@@ -176,8 +176,8 @@ int comedi_command_test(comedi_t *it,comedi_cmd *t)
 	return ret;
 }
 
-EXPORT_SYMBOL(comedi_do_insnlist,0.7.18);
-int comedi_do_insnlist(comedi_t *it,comedi_insnlist *il)
+EXPORT_ALIAS_DEFAULT(_comedi_do_insnlist,comedi_do_insnlist,0.7.18);
+int _comedi_do_insnlist(comedi_t *it,comedi_insnlist *il)
 {
 	int ret;
 	ret = comedi_ioctl(it->fd, COMEDI_INSNLIST, (unsigned long)il);
@@ -185,8 +185,8 @@ int comedi_do_insnlist(comedi_t *it,comedi_insnlist *il)
 	return ret;
 }
 
-EXPORT_SYMBOL(comedi_do_insn,0.7.18);
-int comedi_do_insn(comedi_t *it,comedi_insn *insn)
+EXPORT_ALIAS_DEFAULT(_comedi_do_insn,comedi_do_insn,0.7.18);
+int _comedi_do_insn(comedi_t *it,comedi_insn *insn)
 {
 	if(it->has_insn_ioctl){
 		return comedi_ioctl(it->fd, COMEDI_INSN, (unsigned long)insn);
@@ -204,14 +204,14 @@ int comedi_do_insn(comedi_t *it,comedi_insn *insn)
 	}
 }
 
-EXPORT_SYMBOL(comedi_lock,0.7.18);
-int comedi_lock(comedi_t *it,unsigned int subdevice)
+EXPORT_ALIAS_DEFAULT(_comedi_lock,comedi_lock,0.7.18);
+int _comedi_lock(comedi_t *it,unsigned int subdevice)
 {
 	return comedi_ioctl(it->fd, COMEDI_LOCK, subdevice);
 }
 
-EXPORT_SYMBOL(comedi_unlock,0.7.18);
-int comedi_unlock(comedi_t *it,unsigned int subdevice)
+EXPORT_ALIAS_DEFAULT(_comedi_unlock,comedi_unlock,0.7.18);
+int _comedi_unlock(comedi_t *it,unsigned int subdevice)
 {
 	return comedi_ioctl(it->fd, COMEDI_UNLOCK, subdevice);
 }
diff --git a/lib/data.c b/lib/data.c
index 689669f..ed1c4c3 100644
--- a/lib/data.c
+++ b/lib/data.c
@@ -35,8 +35,8 @@
 #include "libinternal.h"
 
 
-EXPORT_SYMBOL(comedi_data_write,0.7.18);
-int comedi_data_write(comedi_t *it,unsigned int subdev,unsigned int chan,unsigned int range,
+EXPORT_ALIAS_DEFAULT(_comedi_data_write,comedi_data_write,0.7.18);
+int _comedi_data_write(comedi_t *it,unsigned int subdev,unsigned int chan,unsigned int range,
 		unsigned int aref,lsampl_t data)
 {
 	subdevice *s;
@@ -142,8 +142,8 @@ static int comedi_internal_data_read_n(comedi_t *it,
 	}
 }
 
-EXPORT_SYMBOL(comedi_data_read_n,0.7.18);
-int comedi_data_read_n(comedi_t *it, unsigned int subdev,
+EXPORT_ALIAS_DEFAULT(_comedi_data_read_n,comedi_data_read_n,0.7.18);
+int _comedi_data_read_n(comedi_t *it, unsigned int subdev,
 	unsigned int chan, unsigned int range,
 	unsigned int aref, lsampl_t *data, unsigned int n)
 {
@@ -168,16 +168,16 @@ int comedi_data_read_n(comedi_t *it, unsigned int subdev,
 	return 0;
 }
 
-EXPORT_SYMBOL(comedi_data_read,0.7.18);
-int comedi_data_read(comedi_t *it, unsigned int subdev, unsigned int chan,
+EXPORT_ALIAS_DEFAULT(_comedi_data_read,comedi_data_read,0.7.18);
+int _comedi_data_read(comedi_t *it, unsigned int subdev, unsigned int chan,
 	unsigned int range, unsigned int aref, lsampl_t *data)
 {
 	return comedi_internal_data_read_n(it, subdev,
 		CR_PACK(chan, range, aref), data, 1);
 }
 
-EXPORT_SYMBOL(comedi_data_read_hint,0.7.19);
-int comedi_data_read_hint(comedi_t *it, unsigned int subdev,
+EXPORT_ALIAS_DEFAULT(_comedi_data_read_hint,comedi_data_read_hint,0.7.19);
+int _comedi_data_read_hint(comedi_t *it, unsigned int subdev,
 	unsigned int chan, unsigned int range, unsigned int aref)
 {
 	lsampl_t dummy_data;
@@ -185,8 +185,8 @@ int comedi_data_read_hint(comedi_t *it, unsigned int subdev,
 		CR_PACK(chan, range, aref), &dummy_data, 0);
 }
 
-EXPORT_SYMBOL(comedi_data_read_delayed,0.7.19);
-int comedi_data_read_delayed( comedi_t *it, unsigned int subdev,
+EXPORT_ALIAS_DEFAULT(_comedi_data_read_delayed,comedi_data_read_delayed,0.7.19);
+int _comedi_data_read_delayed( comedi_t *it, unsigned int subdev,
 	unsigned int chan, unsigned int range, unsigned int aref,
 	lsampl_t *data, unsigned int nano_sec)
 {
diff --git a/lib/dio.c b/lib/dio.c
index 4c96531..6a897de 100644
--- a/lib/dio.c
+++ b/lib/dio.c
@@ -34,8 +34,8 @@
 #include "libinternal.h"
 
 
-EXPORT_SYMBOL(comedi_dio_config,0.7.18);
-int comedi_dio_config(comedi_t *it,unsigned int subdev,unsigned int chan,unsigned int io)
+EXPORT_ALIAS_DEFAULT(_comedi_dio_config,comedi_dio_config,0.7.18);
+int _comedi_dio_config(comedi_t *it,unsigned int subdev,unsigned int chan,unsigned int io)
 {
 	subdevice *s;
 
@@ -79,8 +79,8 @@ int comedi_dio_config(comedi_t *it,unsigned int subdev,unsigned int chan,unsigne
 	}
 }
 
-EXPORT_SYMBOL(comedi_dio_read,0.7.18);
-int comedi_dio_read(comedi_t *it,unsigned int subdev,unsigned int chan,
+EXPORT_ALIAS_DEFAULT(_comedi_dio_read,comedi_dio_read,0.7.18);
+int _comedi_dio_read(comedi_t *it,unsigned int subdev,unsigned int chan,
 	unsigned int *val)
 {
 	subdevice *s;
@@ -130,8 +130,8 @@ int comedi_dio_read(comedi_t *it,unsigned int subdev,unsigned int chan,
 	}
 }
 
-EXPORT_SYMBOL(comedi_dio_write,0.7.18);
-int comedi_dio_write(comedi_t *it,unsigned int subdev,unsigned int chan,
+EXPORT_ALIAS_DEFAULT(_comedi_dio_write,comedi_dio_write,0.7.18);
+int _comedi_dio_write(comedi_t *it,unsigned int subdev,unsigned int chan,
 	unsigned int val)
 {
 	subdevice *s;
@@ -176,8 +176,8 @@ int comedi_dio_write(comedi_t *it,unsigned int subdev,unsigned int chan,
 	}
 }
 
-EXPORT_SYMBOL(comedi_dio_bitfield,0.7.18);
-int comedi_dio_bitfield(comedi_t *it,unsigned int subdev,unsigned int mask,unsigned int *bits)
+EXPORT_ALIAS_DEFAULT(_comedi_dio_bitfield,comedi_dio_bitfield,0.7.18);
+int _comedi_dio_bitfield(comedi_t *it,unsigned int subdev,unsigned int mask,unsigned int *bits)
 {
 	int ret;
 	unsigned int m,bit;
diff --git a/lib/error.c b/lib/error.c
index d84ca10..96a73fc 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -42,8 +42,8 @@ char *__comedilib_error_strings[]={
 int __comedi_loglevel=1;
 int __comedi_errno=0;
 
-EXPORT_SYMBOL(comedi_loglevel,0.7.18);
-int comedi_loglevel(int loglevel)
+EXPORT_ALIAS_DEFAULT(_comedi_loglevel,comedi_loglevel,0.7.18);
+int _comedi_loglevel(int loglevel)
 {
 	int old_loglevel=__comedi_loglevel;
 	
@@ -52,14 +52,14 @@ int comedi_loglevel(int loglevel)
 	return old_loglevel;
 }
 
-EXPORT_SYMBOL(comedi_errno,0.7.18);
-int comedi_errno(void)
+EXPORT_ALIAS_DEFAULT(_comedi_errno,comedi_errno,0.7.18);
+int _comedi_errno(void)
 {
 	return __comedi_errno;
 }
 
-EXPORT_SYMBOL(comedi_strerror,0.7.18);
-char *comedi_strerror(int errnum)
+EXPORT_ALIAS_DEFAULT(_comedi_strerror,comedi_strerror,0.7.18);
+char* _comedi_strerror(int errnum)
 {
 	if(errnum<COMEDI_NOERROR || errnum>=COMEDI_NOERROR+n_errors)
 		return strerror(errnum);
@@ -67,8 +67,8 @@ char *comedi_strerror(int errnum)
 	return GETTEXT(__comedilib_error_strings[errnum-COMEDI_NOERROR]);
 }
 
-EXPORT_SYMBOL(comedi_perror,0.7.18);
-void comedi_perror(const char *s)
+EXPORT_ALIAS_DEFAULT(_comedi_perror,comedi_perror,0.7.18);
+void _comedi_perror(const char *s)
 {
 	if(__comedi_loglevel>=3){
 		fprintf(stderr,"comedi_perror(): __comedi_errno=%d\n",__comedi_errno);
diff --git a/lib/get.c b/lib/get.c
index fc88f1d..34108a2 100644
--- a/lib/get.c
+++ b/lib/get.c
@@ -35,8 +35,8 @@
 #include "libinternal.h"
 
 
-EXPORT_SYMBOL(comedi_get_n_subdevices,0.7.18);
-int comedi_get_n_subdevices(comedi_t *it)
+EXPORT_ALIAS_DEFAULT(_comedi_get_n_subdevices,comedi_get_n_subdevices,0.7.18);
+int _comedi_get_n_subdevices(comedi_t *it)
 {
 	if(!valid_dev(it))
 		return -1;
@@ -44,8 +44,8 @@ int comedi_get_n_subdevices(comedi_t *it)
 	return it->n_subdevices;
 }
 
-EXPORT_SYMBOL(comedi_get_version_code,0.7.18);
-int comedi_get_version_code(comedi_t *it)
+EXPORT_ALIAS_DEFAULT(_comedi_get_version_code,comedi_get_version_code,0.7.18);
+int _comedi_get_version_code(comedi_t *it)
 {
 	if(!valid_dev(it))
 		return -1;
@@ -53,8 +53,8 @@ int comedi_get_version_code(comedi_t *it)
 	return it->devinfo.version_code;
 }
 
-EXPORT_SYMBOL(comedi_get_driver_name,0.7.18);
-char *comedi_get_driver_name(comedi_t *it)
+EXPORT_ALIAS_DEFAULT(_comedi_get_driver_name,comedi_get_driver_name,0.7.18);
+char* _comedi_get_driver_name(comedi_t *it)
 {
 	if(!valid_dev(it))
 		return NULL;
@@ -62,8 +62,8 @@ char *comedi_get_driver_name(comedi_t *it)
 	return it->devinfo.driver_name;
 }
 
-EXPORT_SYMBOL(comedi_get_board_name,0.7.18);
-char *comedi_get_board_name(comedi_t *it)
+EXPORT_ALIAS_DEFAULT(_comedi_get_board_name,comedi_get_board_name,0.7.18);
+char* _comedi_get_board_name(comedi_t *it)
 {
 	if(!valid_dev(it))
 		return NULL;
@@ -71,8 +71,8 @@ char *comedi_get_board_name(comedi_t *it)
 	return it->devinfo.board_name;
 }
 
-EXPORT_SYMBOL(comedi_get_subdevice_flags,0.7.18);
-int comedi_get_subdevice_flags(comedi_t *it,unsigned int subd)
+EXPORT_ALIAS_DEFAULT(_comedi_get_subdevice_flags,comedi_get_subdevice_flags,0.7.18);
+int _comedi_get_subdevice_flags(comedi_t *it,unsigned int subd)
 {
 	if(!valid_dev(it))
 		return 0;
@@ -80,8 +80,8 @@ int comedi_get_subdevice_flags(comedi_t *it,unsigned int subd)
 	return it->subdevices[subd].subd_flags;
 }
 
-EXPORT_SYMBOL(comedi_get_subdevice_type,0.7.18);
-int comedi_get_subdevice_type(comedi_t *it,unsigned int subd)
+EXPORT_ALIAS_DEFAULT(_comedi_get_subdevice_type,comedi_get_subdevice_type,0.7.18);
+int _comedi_get_subdevice_type(comedi_t *it,unsigned int subd)
 {
 	if(!valid_dev(it))
 		return -1;
@@ -89,8 +89,8 @@ int comedi_get_subdevice_type(comedi_t *it,unsigned int subd)
 	return it->subdevices[subd].type;
 }
 
-EXPORT_SYMBOL(comedi_find_subdevice_by_type,0.7.18);
-int comedi_find_subdevice_by_type(comedi_t *it,int type,unsigned int subd)
+EXPORT_ALIAS_DEFAULT(_comedi_find_subdevice_by_type,comedi_find_subdevice_by_type,0.7.18);
+int _comedi_find_subdevice_by_type(comedi_t *it,int type,unsigned int subd)
 {
 	if(!valid_subd(it,subd))
 		return -1;
@@ -102,8 +102,8 @@ int comedi_find_subdevice_by_type(comedi_t *it,int type,unsigned int subd)
 	return -1;
 }
 
-EXPORT_SYMBOL(comedi_get_read_subdevice,0.7.19);
-int comedi_get_read_subdevice(comedi_t *dev)
+EXPORT_ALIAS_DEFAULT(_comedi_get_read_subdevice,comedi_get_read_subdevice,0.7.19);
+int _comedi_get_read_subdevice(comedi_t *dev)
 {
 	if(!valid_dev(dev))
 		return -1;
@@ -111,8 +111,8 @@ int comedi_get_read_subdevice(comedi_t *dev)
 	return dev->devinfo.read_subdevice;
 }
 
-EXPORT_SYMBOL(comedi_get_write_subdevice,0.7.19);
-int comedi_get_write_subdevice(comedi_t *dev)
+EXPORT_ALIAS_DEFAULT(_comedi_get_write_subdevice,comedi_get_write_subdevice,0.7.19);
+int _comedi_get_write_subdevice(comedi_t *dev)
 {
 	if(!valid_dev(dev))
 		return -1;
@@ -120,8 +120,8 @@ int comedi_get_write_subdevice(comedi_t *dev)
 	return dev->devinfo.write_subdevice;
 }
 
-EXPORT_SYMBOL(comedi_get_n_channels,0.7.18);
-int comedi_get_n_channels(comedi_t *it,unsigned int subd)
+EXPORT_ALIAS_DEFAULT(_comedi_get_n_channels,comedi_get_n_channels,0.7.18);
+int _comedi_get_n_channels(comedi_t *it,unsigned int subd)
 {
 	if(!valid_subd(it,subd))
 		return -1;
@@ -132,8 +132,8 @@ int comedi_get_n_channels(comedi_t *it,unsigned int subd)
 
 /* */
 
-EXPORT_SYMBOL(comedi_get_maxdata,0.7.18);
-lsampl_t comedi_get_maxdata(comedi_t *it,unsigned int subdevice,unsigned int chan)
+EXPORT_ALIAS_DEFAULT(_comedi_get_maxdata,comedi_get_maxdata,0.7.18);
+lsampl_t _comedi_get_maxdata(comedi_t *it,unsigned int subdevice,unsigned int chan)
 {
 	if(!valid_chan(it,subdevice,chan))
 		return 0;
@@ -144,16 +144,16 @@ lsampl_t comedi_get_maxdata(comedi_t *it,unsigned int subdevice,unsigned int cha
 	return it->subdevices[subdevice].maxdata;
 }
 
-EXPORT_SYMBOL(comedi_maxdata_is_chan_specific,0.7.18);
-int comedi_maxdata_is_chan_specific(comedi_t *it,unsigned int subdevice)
+EXPORT_ALIAS_DEFAULT(_comedi_maxdata_is_chan_specific,comedi_maxdata_is_chan_specific,0.7.18);
+int _comedi_maxdata_is_chan_specific(comedi_t *it,unsigned int subdevice)
 {
 	if(it->subdevices[subdevice].maxdata_list)
 		return 1;
 	return 0;
 }
 
-EXPORT_SYMBOL(comedi_get_rangetype,0.7.18);
-int comedi_get_rangetype(comedi_t *it,unsigned int subdevice,unsigned int chan)
+EXPORT_ALIAS_DEFAULT(_comedi_get_rangetype,comedi_get_rangetype,0.7.18);
+int _comedi_get_rangetype(comedi_t *it,unsigned int subdevice,unsigned int chan)
 {
 	if(!valid_chan(it,subdevice,chan))
 		return -1;
@@ -165,8 +165,8 @@ int comedi_get_rangetype(comedi_t *it,unsigned int subdevice,unsigned int chan)
 }
 
 
-EXPORT_SYMBOL(comedi_get_range,0.7.18);
-comedi_range * comedi_get_range(comedi_t *it,unsigned int subdevice,unsigned int chan,unsigned int range)
+EXPORT_ALIAS_DEFAULT(_comedi_get_range,comedi_get_range,0.7.18);
+comedi_range * _comedi_get_range(comedi_t *it,unsigned int subdevice,unsigned int chan,unsigned int range)
 {
 	int range_type;
 
diff --git a/lib/range.c b/lib/range.c
index 26579d7..cc6115d 100644
--- a/lib/range.c
+++ b/lib/range.c
@@ -50,8 +50,8 @@
 
 static enum comedi_oor_behavior comedi_oor_is_nan = COMEDI_OOR_NAN;
 
-EXPORT_SYMBOL(comedi_set_global_oor_behavior,0.7.18);
-enum comedi_oor_behavior comedi_set_global_oor_behavior(
+EXPORT_ALIAS_DEFAULT(_comedi_set_global_oor_behavior,comedi_set_global_oor_behavior,0.7.18);
+enum comedi_oor_behavior _comedi_set_global_oor_behavior(
 	enum comedi_oor_behavior behavior)
 {
 	int old_behavior=comedi_oor_is_nan;
@@ -62,8 +62,8 @@ enum comedi_oor_behavior comedi_set_global_oor_behavior(
 }
 
 
-EXPORT_SYMBOL(comedi_to_phys,0.7.18);
-double comedi_to_phys(lsampl_t data,comedi_range *rng,lsampl_t maxdata)
+EXPORT_ALIAS_DEFAULT(_comedi_to_phys,comedi_to_phys,0.7.18);
+double _comedi_to_phys(lsampl_t data,comedi_range *rng,lsampl_t maxdata)
 {
 	double x;
 
@@ -81,8 +81,8 @@ double comedi_to_phys(lsampl_t data,comedi_range *rng,lsampl_t maxdata)
 	return x;
 }
 
-EXPORT_SYMBOL(comedi_from_phys,0.7.18);
-lsampl_t comedi_from_phys(double data,comedi_range *rng,lsampl_t maxdata)
+EXPORT_ALIAS_DEFAULT(_comedi_from_phys,comedi_from_phys,0.7.18);
+lsampl_t _comedi_from_phys(double data,comedi_range *rng,lsampl_t maxdata)
 {
 	double s;
 
@@ -96,8 +96,8 @@ lsampl_t comedi_from_phys(double data,comedi_range *rng,lsampl_t maxdata)
 	return (lsampl_t)(floor(s+0.5));
 }
 
-EXPORT_SYMBOL(comedi_find_range,0.7.18);
-int comedi_find_range(comedi_t *it,unsigned int subd,unsigned int chan,unsigned int unit,double min,double max)
+EXPORT_ALIAS_DEFAULT(_comedi_find_range,comedi_find_range,0.7.18);
+int _comedi_find_range(comedi_t *it,unsigned int subd,unsigned int chan,unsigned int unit,double min,double max)
 {
 	unsigned int range_type;
 	int best;
@@ -122,8 +122,8 @@ int comedi_find_range(comedi_t *it,unsigned int subd,unsigned int chan,unsigned
 	return best;
 }
 
-EXPORT_SYMBOL(comedi_get_n_ranges,0.7.18);
-int comedi_get_n_ranges(comedi_t *it,unsigned int subd,unsigned int chan)
+EXPORT_ALIAS_DEFAULT(_comedi_get_n_ranges,comedi_get_n_ranges,0.7.18);
+int _comedi_get_n_ranges(comedi_t *it,unsigned int subd,unsigned int chan)
 {
 	unsigned int range_type;
 
@@ -133,14 +133,14 @@ int comedi_get_n_ranges(comedi_t *it,unsigned int subd,unsigned int chan)
 	return RANGE_LENGTH(range_type);
 }
 
-EXPORT_SYMBOL(comedi_range_is_chan_specific,0.7.18);
-int comedi_range_is_chan_specific(comedi_t *it,unsigned int subd)
+EXPORT_ALIAS_DEFAULT(_comedi_range_is_chan_specific,comedi_range_is_chan_specific,0.7.18);
+int _comedi_range_is_chan_specific(comedi_t *it,unsigned int subd)
 {
 	return (it->subdevices[subd].subd_flags&SDF_RANGETYPE)?1:0;
 }
 
-EXPORT_SYMBOL(comedi_sampl_to_phys,0.7.18);
-int comedi_sampl_to_phys(double *dest, int dst_stride, sampl_t *src,
+EXPORT_ALIAS_DEFAULT(_comedi_sampl_to_phys,comedi_sampl_to_phys,0.7.18);
+int _comedi_sampl_to_phys(double *dest, int dst_stride, sampl_t *src,
 	int src_stride, comedi_range *rng, lsampl_t maxdata, int n)
 {
 	int oor = 0;
@@ -176,8 +176,8 @@ int comedi_sampl_to_phys(double *dest, int dst_stride, sampl_t *src,
 	return oor;
 }
 
-EXPORT_SYMBOL(comedi_sampl_from_phys,0.7.18);
-int comedi_sampl_from_phys(sampl_t *dest,int dst_stride,double *src,
+EXPORT_ALIAS_DEFAULT(_comedi_sampl_from_phys,comedi_sampl_from_phys,0.7.18);
+int _comedi_sampl_from_phys(sampl_t *dest,int dst_stride,double *src,
 	int src_stride, comedi_range *rng, lsampl_t maxdata, int n)
 {
 	int oor = 0;
diff --git a/lib/sv.c b/lib/sv.c
index 462da13..13f228d 100644
--- a/lib/sv.c
+++ b/lib/sv.c
@@ -39,8 +39,8 @@
 int sv_measure_l(comedi_sv_t *it,double *data);
 int sv_measure_s(comedi_sv_t *it,double *data);
 
-EXPORT_SYMBOL(comedi_sv_init,0.7.18);
-int comedi_sv_init(comedi_sv_t *it,comedi_t *dev,unsigned int subd,unsigned int chan)
+EXPORT_ALIAS_DEFAULT(_comedi_sv_init,comedi_sv_init,0.7.18);
+int _comedi_sv_init(comedi_sv_t *it,comedi_t *dev,unsigned int subd,unsigned int chan)
 {
 	if(!valid_chan(dev,subd,chan))return -1;
 	if(!it)return -1;
@@ -55,8 +55,8 @@ int comedi_sv_init(comedi_sv_t *it,comedi_t *dev,unsigned int subd,unsigned int
 	return comedi_sv_update(it);
 }
 
-EXPORT_SYMBOL(comedi_sv_update,0.7.18);
-int comedi_sv_update(comedi_sv_t *it)
+EXPORT_ALIAS_DEFAULT(_comedi_sv_update,comedi_sv_update,0.7.18);
+int _comedi_sv_update(comedi_sv_t *it)
 {
 	if(!it)return -1;
 	if(!valid_chan(it->dev,it->subdevice,it->chan))return -1;
@@ -69,8 +69,8 @@ int comedi_sv_update(comedi_sv_t *it)
 	return 0;
 }
 
-EXPORT_SYMBOL(comedi_sv_measure,0.7.18);
-int comedi_sv_measure(comedi_sv_t *it,double *data)
+EXPORT_ALIAS_DEFAULT(_comedi_sv_measure,comedi_sv_measure,0.7.18);
+int _comedi_sv_measure(comedi_sv_t *it,double *data)
 {
 	if(it->dev->subdevices[it->subdevice].subd_flags & SDF_LSAMPL){
 		return sv_measure_l(it,data);
diff --git a/lib/timed.c b/lib/timed.c
index e9d748b..f19845f 100644
--- a/lib/timed.c
+++ b/lib/timed.c
@@ -37,8 +37,8 @@
 
 #define BUFSZ 100
 
-EXPORT_SYMBOL(comedi_timed_1chan,0.7.18);
-int comedi_timed_1chan(comedi_t *dev,unsigned int subd,unsigned int chan,unsigned int range,
+EXPORT_ALIAS_DEFAULT(_comedi_timed_1chan,comedi_timed_1chan,0.7.18);
+int _comedi_timed_1chan(comedi_t *dev,unsigned int subd,unsigned int chan,unsigned int range,
 	unsigned int aref,double freq,unsigned int n_samples,double *data)
 {
 	comedi_trig t;
diff --git a/lib/timer.c b/lib/timer.c
index 2404c34..a12ee8d 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -141,8 +141,8 @@ static timerfunc timer_functions[]={
 };
 #define N_TIMERTYPES 6
 
-EXPORT_SYMBOL(comedi_get_timer,0.7.18);
-int comedi_get_timer(comedi_t *it,unsigned int subdev,double freq,
+EXPORT_ALIAS_DEFAULT(_comedi_get_timer,comedi_get_timer,0.7.18);
+int _comedi_get_timer(comedi_t *it,unsigned int subdev,double freq,
 	unsigned int *trigvar,double *actual_freq)
 {
 	int timer_type;
diff --git a/lib/version_script b/lib/version_script
index beaaaf5..41578d5 100644
--- a/lib/version_script
+++ b/lib/version_script
@@ -1,23 +1,82 @@
 
 v0.7.18 {
+	global:
+		comedi_cancel;
+		comedi_close;
+		comedi_command_test;
+		comedi_command;
+		comedi_data_read;
+		comedi_data_read_n;
+		comedi_data_write;
+		comedi_do_insn;
+		comedi_do_insnlist;
+		comedi_dio_bitfield;
+		comedi_dio_config;
+		comedi_dio_read;
+		comedi_dio_write;
+		comedi_errno;
+		comedi_fileno;
+		comedi_find_range;
+		comedi_find_subdevice_by_type;
+		comedi_from_phys;
+		comedi_get_front_count;
+		comedi_get_board_name;
+		comedi_get_buffer_contents;
+		comedi_get_buffer_offset;
+		comedi_get_buffer_size;
+		comedi_get_cmd_generic_timed;
+		comedi_get_cmd_src_mask;
+		comedi_get_driver_name;
+		comedi_get_maxdata;
+		comedi_get_max_buffer_size;
+		comedi_get_n_channels;
+		comedi_get_n_ranges;
+		comedi_get_n_subdevices;
+		comedi_get_range;
+		comedi_get_rangetype;
+		comedi_get_subdevice_flags;
+		comedi_get_subdevice_type;
+		comedi_get_timer;
+		comedi_get_version_code;
+		comedi_set_buffer_size;
+		comedi_set_max_buffer_size;
+		comedi_lock;
+		comedi_loglevel;
+		comedi_mark_buffer_read;
+		comedi_maxdata_is_chan_specific;
+		comedi_open;
+		comedi_perror;
+		comedi_poll;
+		comedi_range_is_chan_specific;
+		comedi_sampl_from_phys;
+		comedi_sampl_to_phys;
+		comedi_set_global_oor_behavior;
+		comedi_strerror;
+		comedi_sv_init;
+		comedi_sv_measure;
+		comedi_sv_update;
+		comedi_timed_1chan;
+		comedi_to_phys;
+		comedi_trigger;
+		comedi_unlock;
 	local:
-		_comedi_*;
-		get_rangeinfo;
-		get_subdevices;
-		initialize;
-		internal_error;
-		libc_error;
-		sv_measure_l;
-		sv_measure_s;
-		valid_chan;
-		valid_dev;
-		valid_subd;
+		*;
 };
 
 v0.7.19 {
-
+	global:
+		comedi_data_read_delayed;
+		comedi_data_read_hint;
+		comedi_get_read_subdevice;
+		comedi_get_write_subdevice;
 } v0.7.18;
 
 v0.7.20 {
+	global:
+		comedi_apply_calibration;
+		comedi_cleanup_calibration;
+		comedi_get_default_calibration_path;
+		comedi_apply_parsed_calibration;
+		comedi_parse_calibration_file;
 
 } v0.7.19;
-- 
2.26.2