Remove unnecessary '&' decoration for function

pointers.
Fix double declaration of TclNativeDupInternalRep

6 files changed, 12 insertions, 11 deletions

diff --git a/unix/dltest/.cvsignore b/unix/dltest/.cvsignore
index 5325f6e..6ff1067 100644
--- a/unix/dltest/.cvsignore
+++ b/unix/dltest/.cvsignore
@@ -2,3 +2,4 @@ Makefile
 *.bundle
 *.dylib
 *.dll
+*.so
diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c
index 7bb1da3..3043f92 100644
--- a/unix/tclLoadDl.c
+++ b/unix/tclLoadDl.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclLoadDl.c,v 1.17 2008/04/27 22:21:33 dkf Exp $
+ * RCS: @(#) $Id: tclLoadDl.c,v 1.18 2010/03/11 13:35:25 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -104,7 +104,7 @@ TclpDlopen(
 	return TCL_ERROR;
     }
 
-    *unloadProcPtr = &TclpUnloadFile;
+    *unloadProcPtr = TclpUnloadFile;
     *loadHandle = (Tcl_LoadHandle) handle;
     return TCL_OK;
 }
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index 5e330c8..79fa227 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclLoadDyld.c,v 1.32 2009/04/10 18:10:39 das Exp $
+ * RCS: @(#) $Id: tclLoadDyld.c,v 1.33 2010/03/11 13:35:25 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -308,7 +308,7 @@ TclpDlopen(
 	dyldLoadHandle->modulePtr = modulePtr;
 #endif
 	*loadHandle = (Tcl_LoadHandle) dyldLoadHandle;
-	*unloadProcPtr = &TclpUnloadFile;
+	*unloadProcPtr = TclpUnloadFile;
 	result = TCL_OK;
     } else {
 	Tcl_AppendResult(interp, errMsg, NULL);
@@ -758,7 +758,7 @@ TclpLoadMemory(
     dyldLoadHandle->dyldLibHeader = NULL;
     dyldLoadHandle->modulePtr = modulePtr;
     *loadHandle = (Tcl_LoadHandle) dyldLoadHandle;
-    *unloadProcPtr = &TclpUnloadFile;
+    *unloadProcPtr = TclpUnloadFile;
     return TCL_OK;
 }
 #endif /* TCL_LOAD_FROM_MEMORY */
diff --git a/unix/tclLoadNext.c b/unix/tclLoadNext.c
index 4168ebb..5b66f4e 100644
--- a/unix/tclLoadNext.c
+++ b/unix/tclLoadNext.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclLoadNext.c,v 1.14 2008/04/27 22:21:34 dkf Exp $
+ * RCS: @(#) $Id: tclLoadNext.c,v 1.15 2010/03/11 13:35:25 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -96,7 +96,7 @@ TclpDlopen(
     NXCloseMemory(errorStream, NX_FREEBUFFER);
 
     *loadHandle = (Tcl_LoadHandle)1; /* A dummy non-NULL value */
-    *unloadProcPtr = &TclpUnloadFile;
+    *unloadProcPtr = TclpUnloadFile;
 
     return TCL_OK;
 }
diff --git a/unix/tclLoadOSF.c b/unix/tclLoadOSF.c
index 8a63035..4d91243 100644
--- a/unix/tclLoadOSF.c
+++ b/unix/tclLoadOSF.c
@@ -31,7 +31,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclLoadOSF.c,v 1.14 2008/04/27 22:21:34 dkf Exp $
+ * RCS: @(#) $Id: tclLoadOSF.c,v 1.15 2010/03/11 13:35:25 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -120,7 +120,7 @@ TclpDlopen(
 	pkg++;
     }
     *loadHandle = pkg;
-    *unloadProcPtr = &TclpUnloadFile;
+    *unloadProcPtr = TclpUnloadFile;
     return TCL_OK;
 }
 
diff --git a/unix/tclLoadShl.c b/unix/tclLoadShl.c
index a3a3fc5..b989d7e 100644
--- a/unix/tclLoadShl.c
+++ b/unix/tclLoadShl.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclLoadShl.c,v 1.17 2008/04/27 22:21:34 dkf Exp $
+ * RCS: @(#) $Id: tclLoadShl.c,v 1.18 2010/03/11 13:35:25 nijtmans Exp $
  */
 
 #include <dl.h>
@@ -98,7 +98,7 @@ TclpDlopen(
 	return TCL_ERROR;
     }
     *loadHandle = (Tcl_LoadHandle) handle;
-    *unloadProcPtr = &TclpUnloadFile;
+    *unloadProcPtr = TclpUnloadFile;
     return TCL_OK;
 }