From 9c293c15158bfb03b0eee7c1709475e67ecfa0fb Mon Sep 17 00:00:00 2001 From: Gurusamy Sarathy Date: Sat, 4 Apr 1998 17:26:32 +0000 Subject: [PATCH] [win32] remove __declspec kludge in sdbm.h in favor of setting a flag for static symbols p4raw-id: //depot/win32/perl@876 --- EXTERN.h | 2 +- ext/SDBM_File/sdbm/Makefile.PL | 2 +- ext/SDBM_File/sdbm/sdbm.h | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/EXTERN.h b/EXTERN.h index 8b0584e..b0435c2 100644 --- a/EXTERN.h +++ b/EXTERN.h @@ -27,7 +27,7 @@ # define EXTCONST globalref # define dEXTCONST globaldef {"$GLOBAL_RO_VARS"} readonly #else -# if defined(WIN32) && !defined(__GNUC__) +# if defined(WIN32) && !defined(PERL_STATIC_SYMS) && !defined(__GNUC__) # ifdef PERLDLL # define EXT extern __declspec(dllexport) # define dEXT diff --git a/ext/SDBM_File/sdbm/Makefile.PL b/ext/SDBM_File/sdbm/Makefile.PL index 96f5b7a..24074af 100644 --- a/ext/SDBM_File/sdbm/Makefile.PL +++ b/ext/SDBM_File/sdbm/Makefile.PL @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; $define = '-DSDBM -DDUFF'; -$define .= ' -DWIN32' if ($^O eq 'MSWin32'); +$define .= ' -DWIN32 -DPERL_STATIC_SYMS' if ($^O eq 'MSWin32'); if ($^O eq 'VMS') { # Old VAXC compiler can't handle Duff's device require Config; diff --git a/ext/SDBM_File/sdbm/sdbm.h b/ext/SDBM_File/sdbm/sdbm.h index 3a1f57c..0747b74 100644 --- a/ext/SDBM_File/sdbm/sdbm.h +++ b/ext/SDBM_File/sdbm/sdbm.h @@ -16,11 +16,6 @@ #endif #define PAGFEXT ".pag" -#ifdef WIN32 -#undef __declspec -#define __declspec(t) /* kludge for EXTCONST below */ -#endif - typedef struct { int dirf; /* directory file descriptor */ int pagf; /* page file descriptor */ -- 2.7.4