Add support for dlopen on recent NetBSD/MIPS, per Rémi Zara.

alvherre · alvherre · commit 7a069eacff2a · 2008-03-05T21:20:47.000Z
diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c
@@ -3,7 +3,7 @@
  * Portions Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.c,v 1.22 2008/01/01 19:45:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.c,v 1.22.2.1 2008/03/05 21:20:47 alvherre Exp $
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -57,7 +57,7 @@ BSD44_derived_dlerror(void)
 void *
 BSD44_derived_dlopen(const char *file, int num)
 {
-#if defined(__mips__)
+#if !defined(HAVE_DLOPEN)
 	snprintf(error_message, sizeof(error_message),
 			 "dlopen (%s) not supported", file);
 	return NULL;
@@ -74,7 +74,7 @@ BSD44_derived_dlopen(const char *file, int num)
 void *
 BSD44_derived_dlsym(void *handle, const char *name)
 {
-#if defined(__mips__)
+#if !defined(HAVE_DLOPEN)
 	snprintf(error_message, sizeof(error_message),
 			 "dlsym (%s) failed", name);
 	return NULL;
@@ -99,8 +99,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 void
 BSD44_derived_dlclose(void *handle)
 {
-#if defined(__mips__)
-#else
+#if defined(HAVE_DLOPEN)
 	dlclose(handle);
 #endif
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* Portions Copyright (c) 1990 The Regents of the University of California.`
`4`	`4`	`* All rights reserved.`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.c,v 1.22 2008/01/01 19:45:51 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.c,v 1.22.2.1 2008/03/05 21:20:47 alvherre Exp $`
`7`	`7`	`*`
`8`	`8`	`* Redistribution and use in source and binary forms, with or without`
`9`	`9`	`* modification, are permitted provided that the following conditions`
`@@ -57,7 +57,7 @@ BSD44_derived_dlerror(void)`
`57`	`57`	`void *`
`58`	`58`	`BSD44_derived_dlopen(const char *file, int num)`
`59`	`59`	`{`
`60`		`-#if defined(__mips__)`
	`60`	`+#if !defined(HAVE_DLOPEN)`
`61`	`61`	`snprintf(error_message, sizeof(error_message),`
`62`	`62`	`"dlopen (%s) not supported", file);`
`63`	`63`	`return NULL;`
`@@ -74,7 +74,7 @@ BSD44_derived_dlopen(const char *file, int num)`
`74`	`74`	`void *`
`75`	`75`	`BSD44_derived_dlsym(void handle, const char name)`
`76`	`76`	`{`
`77`		`-#if defined(__mips__)`
	`77`	`+#if !defined(HAVE_DLOPEN)`
`78`	`78`	`snprintf(error_message, sizeof(error_message),`
`79`	`79`	`"dlsym (%s) failed", name);`
`80`	`80`	`return NULL;`
`@@ -99,8 +99,7 @@ BSD44_derived_dlsym(void handle, const char name)`
`99`	`99`	`void`
`100`	`100`	`BSD44_derived_dlclose(void *handle)`
`101`	`101`	`{`
`102`		`-#if defined(__mips__)`
`103`		`-#else`
	`102`	`+#if defined(HAVE_DLOPEN)`
`104`	`103`	`dlclose(handle);`
`105`	`104`	`#endif`
`106`	`105`	`}`