diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1997-02-06 08:40:16 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1997-02-06 08:40:16 +0000 |
| commit | 2c9dbc57e597ccf7d1e6b3d0291bda9e9517f522 (patch) | |
| tree | 15fb436b5c3425b486987db34531fc935cba1930 /src/backend/port/linux | |
| parent | 9b9141245ccb085fdf25eedbf852cc0c3b811014 (diff) | |
| download | postgresql-2c9dbc57e597ccf7d1e6b3d0291bda9e9517f522.tar.gz postgresql-2c9dbc57e597ccf7d1e6b3d0291bda9e9517f522.zip | |
Various changes to improve/support Mklinux
Submitted by: Tatsuo Ishii
Diffstat (limited to 'src/backend/port/linux')
| -rw-r--r-- | src/backend/port/linux/dynloader.c | 13 | ||||
| -rw-r--r-- | src/backend/port/linux/port-protos.h | 9 |
2 files changed, 19 insertions, 3 deletions
diff --git a/src/backend/port/linux/dynloader.c b/src/backend/port/linux/dynloader.c index ebf0625dd73..a3b551b6f95 100644 --- a/src/backend/port/linux/dynloader.c +++ b/src/backend/port/linux/dynloader.c @@ -10,12 +10,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/dynloader.c,v 1.1.1.1 1996/07/09 06:21:44 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/dynloader.c,v 1.2 1997/02/06 08:39:40 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> +#ifdef HAVE_DLD_H #include <dld.h> +#endif #include "postgres.h" #include "port-protos.h" #include "utils/elog.h" @@ -26,6 +28,10 @@ extern char pg_pathname[]; void * pg_dlopen(char *filename) { +#ifndef HAVE_DLD_H + elog(WARN, "dynamic load not supported"); + return(NULL); +#else static int dl_initialized= 0; /* @@ -84,10 +90,15 @@ pg_dlopen(char *filename) } return (void *) strdup(filename); +#endif } char * pg_dlerror() { +#ifndef HAVE_DLD_H + return("dynaloader unspported"); +#else return dld_strerror(dld_errno); +#endif } diff --git a/src/backend/port/linux/port-protos.h b/src/backend/port/linux/port-protos.h index f80cd62d424..76f02b48fe9 100644 --- a/src/backend/port/linux/port-protos.h +++ b/src/backend/port/linux/port-protos.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: port-protos.h,v 1.1.1.1 1996/07/09 06:21:44 scrappy Exp $ + * $Id: port-protos.h,v 1.2 1997/02/06 08:39:53 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -22,8 +22,13 @@ /* dynloader.c */ #ifndef LINUX_ELF +# ifndef HAVE_DLD_H +#define pg_dlsym(handle, funcname) (NULL) +# define pg_dlclose(handle) ({}) +# else #define pg_dlsym(handle, funcname) ((func_ptr) dld_get_func((funcname))) -#define pg_dlclose(handle) ({ dld_unlink_by_file(handle, 1); free(handle); }) +# define pg_dlclose(handle) ({ dld_unlink_by_file(handle, 1); free(handle); }) +# endif #else /* #define pg_dlopen(f) dlopen(f, 1) */ #define pg_dlopen(f) dlopen(f, 2) |