Jan Dubois wrote:
I've uploaded 0.28_01 to CPAN; final release will be 0.29, as 0.28
has already been used by ActivePerl 820.
I've attached the diff between 0.27_02 and 0.28_01.
Let me know if there are any other problems, or if I should turn this into 0.29.
All looks OK on WinXP with VC6 against perl-5.8.8, maint and blead, and
with GCC against blead.
I know you've said before that you're not bothered about Borland, but
building with Borland against blead I do get some errors (below). The
attached patch is enough to fix them, so could you apply that (or
equivalent) please?
bcc32 -c -O2 -D_RTLDLL -DWIN32 -DHAVE_DES_FCRYPT -D_MT
-D__USELOCALES__ -
D_WIN32_WINNT=0x0410 -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -O2
-D_RTLDLL
-DVERSION=\"0.28_01\" -DXS_VERSION=\"0.28_01\"
"-IC:\perl\lib\CORE"
Win32.c
Borland C++ 5.5.1 for Win32 Copyright (c) 1993, 2000 Borland
win32.c:
Warning W8064 Win32.xs 404: Call to function with no prototype in
function w32_I
sAdminUser
Error E2451 Win32.xs 848: Undefined symbol 'CSIDL_CDBURN_AREA' in
function w32_G
etFolderPath
Error E2451 Win32.xs 884: Undefined symbol 'CSIDL_COMMON_MUSIC' in
function w32_
GetFolderPath
Error E2451 Win32.xs 885: Undefined symbol 'CSIDL_COMMON_PICTURES' in
function w
32_GetFolderPath
Error E2172 Win32.xs 885: Duplicate case in function w32_GetFolderPath
Error E2188 Win32.xs 885: Expression syntax in function w32_GetFolderPath
Error E2451 Win32.xs 886: Undefined symbol 'CSIDL_COMMON_VIDEO' in
function w32_
GetFolderPath
Error E2172 Win32.xs 886: Duplicate case in function w32_GetFolderPath
Error E2188 Win32.xs 886: Expression syntax in function w32_GetFolderPath
*** 8 errors in Compile ***
dmake: Error code 129, while making 'Win32.obj'
Steve, are you going to integrate directly from CPAN or do you prefer me
to create a patch against bleadperl for you?
I'm happy to integrate from CPAN. I'll wait until 0.29 is uploaded, of
course, in case you have any further changes before then.
--
diff -ruN Win32-0.28_01.orig/Win32.xs Win32-0.28_01/Win32.xs
--- Win32-0.28_01.orig/Win32.xs 2007-05-16 19:58:26.000000000 +0100
+++ Win32-0.28_01/Win32.xs 2007-05-17 17:58:19.339222700 +0100
@@ -45,14 +45,10 @@
#ifndef CSIDL_ADMINTOOLS
# define CSIDL_ADMINTOOLS 0x0030
-# define CSIDL_CDBURN_AREA 0x003B
# define CSIDL_COMMON_ADMINTOOLS 0x002F
# define CSIDL_COMMON_APPDATA 0x0023
# define CSIDL_COMMON_DOCUMENTS 0x002E
-# define CSIDL_COMMON_MUSIC 0x0035
-# define CSIDL_COMMON_PICTURES 0x0036
# define CSIDL_COMMON_TEMPLATES 0x002D
-# define CSIDL_COMMON_VIDEO 0x0037
# define CSIDL_LOCAL_APPDATA 0x001C
# define CSIDL_MYPICTURES 0x0027
# define CSIDL_PROFILE 0x0028
@@ -61,6 +57,22 @@
# define CSIDL_WINDOWS 0x0024
#endif
+#ifndef CSIDL_CDBURN_AREA
+# define CSIDL_CDBURN_AREA 0x003B
+#endif
+
+#ifndef CSIDL_COMMON_MUSIC
+# define CSIDL_COMMON_MUSIC 0x0035
+#endif
+
+#ifndef CSIDL_COMMON_PICTURES
+# define CSIDL_COMMON_PICTURES 0x0036
+#endif
+
+#ifndef CSIDL_COMMON_VIDEO
+# define CSIDL_COMMON_VIDEO 0x0037
+#endif
+
#ifndef CSIDL_MYMUSIC
# define CSIDL_MYMUSIC 0x000D
#endif
