fixups for sundry warnings about function pointers

p4raw-id: //depot/perl@3669

4 files changed, 19 insertions, 15 deletions

diff --git a/win32/Makefile b/win32/Makefile
index 3139be66a4..82a72ecc74 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -138,10 +138,7 @@ CCLIBDIR	= $(CCHOME)\lib
 # We don't enable this by default because we want the modules to get fixed
 # instead of clinging to shortcuts like this one.
 #
-# Don't enable -DPERL_IMPLICIT_CONTEXT if you don't know what it is. :-)
-#
 #BUILDOPT	= $(BUILDOPT) -DPERL_POLLUTE
-#BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 
 #
 # specify semicolon-separated list of extra directories that modules will
@@ -186,6 +183,10 @@ USE_THREADS	= undef
 USE_MULTI	= undef
 !ENDIF
 
+!IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != ""
+BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
+!ENDIF
+
 !IF "$(PROCESSOR_ARCHITECTURE)" == ""
 PROCESSOR_ARCHITECTURE	= x86
 !ENDIF
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 2289b915a4..ffda9fd6e8 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -153,10 +153,7 @@ CCLIBDIR	*= $(CCHOME)\lib
 # We don't enable this by default because we want the modules to get fixed
 # instead of clinging to shortcuts like this one.
 #
-# Don't enable -DPERL_IMPLICIT_CONTEXT if you don't know what it is. :-)
-#
 #BUILDOPT	+= -DPERL_POLLUTE
-#BUILDOPT	+= -DPERL_IMPLICIT_CONTEXT
 
 #
 # specify semicolon-separated list of extra directories that modules will
@@ -174,7 +171,7 @@ EXTRALIBDIRS	*=
 # set this to your email address (perl will guess a value from
 # from your loginname and your hostname, which may not be right)
 #
-EMAIL		*= support@activestate.com
+#EMAIL		*=
 
 ##
 ## Build configuration ends.
@@ -200,6 +197,12 @@ PERL_MALLOC	*= undef
 USE_THREADS	*= undef
 USE_MULTI	*= undef
 
+
+.IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != ""
+BUILDOPT	+= -DPERL_IMPLICIT_CONTEXT
+.ENDIF
+
+
 .IMPORT .IGNORE : PROCESSOR_ARCHITECTURE
 
 PROCESSOR_ARCHITECTURE *= x86
@@ -639,12 +642,7 @@ X2P_OBJ		= $(X2P_SRC:db:+$(o))
 PERLDLL_OBJ	= $(CORE_OBJ)
 PERLEXE_OBJ	= perlmain$(o)
 
-.IF "$(USE_OBJECT)" != "define"
 PERLDLL_OBJ	+= $(WIN32_OBJ) $(DLL_OBJ)
-.ELSE
-PERLEXE_OBJ	+= $(WIN32_OBJ) $(DLL_OBJ)
-PERL95_OBJ	+= DynaLoadmt$(o)
-.ENDIF
 
 .IF "$(USE_SETARGV)" != ""
 SETARGV_OBJ	= setargv$(o)
diff --git a/win32/win32.c b/win32/win32.c
index a0115732a0..59e493ab7f 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -66,6 +66,11 @@
 int _CRT_glob = 0;
 #endif
 
+#ifdef __BORLANDC__
+#  define _stat stat
+#  define _utimbuf utimbuf
+#endif
+
 #define EXECF_EXEC 1
 #define EXECF_SPAWN 2
 #define EXECF_SPAWN_NOWAIT 3
@@ -1551,9 +1556,9 @@ extern char *	des_fcrypt(const char *txt, const char *salt, char *cbuf);
 DllExport char *
 win32_crypt(const char *txt, const char *salt)
 {
+    dTHXo;
 #ifdef HAVE_DES_FCRYPT
     dTHR;
-    dTHXo;
     return des_fcrypt(txt, salt, crypt_buffer);
 #else
     die("The crypt() function is unimplemented due to excessive paranoia.");
diff --git a/win32/win32.h b/win32/win32.h
index 1110f7e18a..0ed53d6f47 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -182,7 +182,7 @@ struct utsname {
 
 /* Borland is picky about a bare member function name used as its ptr */
 #ifdef PERL_OBJECT
-#define FUNC_NAME_TO_PTR(name)	&(name)
+#  define MEMBER_TO_FPTR(name)	&(name)
 #endif
 
 #endif
@@ -256,7 +256,7 @@ typedef long		gid_t;
 #define fcloseall	_fcloseall
 
 #ifdef PERL_OBJECT
-#define FUNC_NAME_TO_PTR(name)	&(name)
+#  define MEMBER_TO_FPTR(name)	&(name)
 #endif
 
 #ifndef _O_NOINHERIT