Skip to content

Commit 4f8db3e

Browse files
committed
FreeBSD doesn't require the dl{open,close,sym,error} functions, as they are
already included in the system libraries. Used if !defined(__FreeBSD__) to single FreeBSD out from the other BSD44 derived OSs
1 parent 24632b0 commit 4f8db3e

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

src/backend/port/BSD44_derived/dl.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91";
4545

4646
#include "port-protos.h"
4747

48+
#if !defined(__FreeBSD__)
49+
4850
static char error_message[BUFSIZ];
4951

5052
char *
@@ -101,3 +103,5 @@ BSD44_derived_dlclose(void *handle)
101103
dlclose(handle);
102104
#endif
103105
}
106+
107+
#endif /* __FreeBSD__ */

src/backend/port/BSD44_derived/port-protos.h

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: port-protos.h,v 1.3 1996/10/31 11:09:37 scrappy Exp $
9+
* $Id: port-protos.h,v 1.4 1997/01/03 04:59:01 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -35,10 +35,17 @@
3535
* begin with an underscore is fairly tricky, and some versions of
3636
* NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.)
3737
*/
38-
#define pg_dlopen(f) BSD44_derived_dlopen(f, 1)
39-
#define pg_dlsym BSD44_derived_dlsym
40-
#define pg_dlclose BSD44_derived_dlclose
41-
#define pg_dlerror BSD44_derived_dlerror
38+
#if !defined(__FreeBSD__)
39+
# define pg_dlopen(f) BSD44_derived_dlopen(f, 1)
40+
# define pg_dlsym BSD44_derived_dlsym
41+
# define pg_dlclose BSD44_derived_dlclose
42+
# define pg_dlerror BSD44_derived_dlerror
43+
#else
44+
# define pg_dlopen(f) dlopen(f, 1)
45+
# define pg_dlsym dlsym
46+
# define pg_dlclose dlclose
47+
# define pg_dlerror dlerror
48+
#endif
4249

4350
char * BSD44_derived_dlerror(void);
4451
void * BSD44_derived_dlopen(const char *filename, int num);

0 commit comments

Comments
 (0)