diff options
| author | Berke Viktor <bviktor@hexchat.org> | 2012-07-11 19:46:46 +0200 |
|---|---|---|
| committer | Berke Viktor <bviktor@hexchat.org> | 2012-07-11 19:46:46 +0200 |
| commit | 1ea726a91809340451c7a05ede34e7be00ba7863 (patch) | |
| tree | 936bb6fce5c26b3876a7324ec82ee0bb232875d7 /plugins/perl/perl.c | |
| parent | d81619cca95831e2fd444d71cd078201f3db0e39 (diff) | |
| parent | 9d9c24c8d347aa44efbd63e8f8c8dfb5b3cddedb (diff) | |
Merge branch 'wdk'
Diffstat (limited to 'plugins/perl/perl.c')
| -rw-r--r-- | plugins/perl/perl.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c index 1be7562e..b07aa651 100644 --- a/plugins/perl/perl.c +++ b/plugins/perl/perl.c @@ -22,12 +22,15 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <dirent.h> #ifdef ENABLE_NLS #include <locale.h> #endif #ifdef WIN32 #include <windows.h> +#define _INC_DIRENT /* disable inclusion of perl's dirent.h, we use an own version for win32 */ +#include "../../src/dirent/dirent-win32.h" +#else +#include <dirent.h> #endif #undef PACKAGE @@ -1342,7 +1345,11 @@ perl_load_file (char *filename) if (GetLastError () == ERROR_BAD_EXE_FORMAT) /* http://forum.xchat.org/viewtopic.php?t=3277 */ thread_mbox ("Cannot use this " PERL_DLL "\n\n" - "32-bit ActivePerl is required."); +#ifdef _WIN64 + "64-bit Strawberry Perl is required."); +#else + "32-bit Strawberry Perl is required."); +#endif else { /* a lot of people install this old version */ lib = LoadLibraryA ("perl56.dll"); |