changeset 4959:bd169a24a554

merge
author Ben Wing <ben@xemacs.org>
date Thu, 28 Jan 2010 04:27:30 -0600
parents 99f2102552d7 (diff) e4bbe5622a80 (current diff)
children 45b6288416e3
files etc/gdbinit.in src/ChangeLog src/number.c src/syswindows.h
diffstat 2 files changed, 20 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Jan 28 03:32:18 2010 -0600
+++ b/src/ChangeLog	Thu Jan 28 04:27:30 2010 -0600
@@ -1,3 +1,15 @@
+2010-01-28  Ben Wing  <ben@xemacs.org>
+
+	* syswindows.h:
+	Add typedefs for PCVOID and PDWORD_PTR for non-Cygwin-headers folks
+	(i.e. Visual Studio et al.).
+
+2010-01-27  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* number.c (Fdenominator): 
+	Oops, change #else to #endif here; thank you Vin Shelton, thank
+	you Robert Delius Royar.
+
 2010-01-28  Ben Wing  <ben@xemacs.org>
 
 	* device-x.c (x_init_device):
--- a/src/syswindows.h	Thu Jan 28 03:32:18 2010 -0600
+++ b/src/syswindows.h	Thu Jan 28 04:27:30 2010 -0600
@@ -473,8 +473,16 @@
 typedef LPCDLGTEMPLATE LPCDLGTEMPLATEA;
 
 #else /* !CYGWIN_HEADERS */
+
 #define W32API_VER(major,minor) 0
 #define W32API_INSTALLED_VER 0
+
+/* Some types that show up in Cygwin headers but not in Visual Studio headers,
+   and cause problems if we used Cygwin headers to generate
+   intl-auto-encap-win32.[ch]. */
+typedef LPCVOID PCVOID;
+typedef LPDWORD *PDWORD_PTR;
+
 #endif /* CYGWIN_HEADERS */
 
 /* Not in VC 6 */