Mercurial > hg > xemacs-beta

changeset 4827:11daf37dae4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more fixes to get a clean compile
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:04:44 -0600
parents 780bb5441c14
children f31c12360354 d877c14318b3
files src/faces.c src/redisplay-x.c src/syswindows.h src/vdb-win32.c
diffstat 4 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/faces.c	Sat Dec 26 21:04:32 2009 -0600
+++ b/src/faces.c	Sat Dec 26 21:04:44 2009 -0600
@@ -2272,6 +2272,7 @@
     Lisp_Object device_symbol = Qx;
 #endif
 
+#if defined (USE_XFT) || defined (MULE)
     const Ascbyte **fontptr;
 
     const Ascbyte *fonts[] =
@@ -2301,6 +2302,7 @@
       "-*-*-medium-r-*-*-*-170-*-*-c-*-*-*",
 #endif
     };
+#endif /* defined (USE_XFT) || defined (MULE) */
 
 #ifdef MULE
 
--- a/src/redisplay-x.c	Sat Dec 26 21:04:32 2009 -0600
+++ b/src/redisplay-x.c	Sat Dec 26 21:04:44 2009 -0600
@@ -136,7 +136,6 @@
 			      const Ichar *str, Charcount len,
 			      struct face_cachel *UNUSED(cachel))
 {
-  int i;
   if (!len)
     return 0;
 
--- a/src/syswindows.h	Sat Dec 26 21:04:32 2009 -0600
+++ b/src/syswindows.h	Sat Dec 26 21:04:44 2009 -0600
@@ -55,7 +55,8 @@
 
 BEGIN_C_DECLS
 
-#if 0 /* breaks the build, as of GCC 3.4.4 or earlier */
+#if 0 /* breaks the build, as of GCC 3.4.4 or earlier, since the prototype
+         is now declared static */
 /* Fucking GCC complains about "no previous prototype" for inline
    functions.  DUH!  See DECLARE_INLINE_HEADER. */
 extern __inline void *GetCurrentFiber (void);
--- a/src/vdb-win32.c	Sat Dec 26 21:04:32 2009 -0600
+++ b/src/vdb-win32.c	Sat Dec 26 21:04:44 2009 -0600
@@ -29,7 +29,7 @@
 #include "syswindows.h"
 
 
-DWORD WINAPI 
+LONG WINAPI 
 win32_fault_handler (LPEXCEPTION_POINTERS e)
 {
 #define GET_FAULT_ADDRESS (void *) e->ExceptionRecord->ExceptionInformation[1]
@@ -46,7 +46,7 @@
     return EXCEPTION_CONTINUE_SEARCH;
 }
 
-typedef DWORD (WINAPI *gcPVECTORED_EXCEPTION_HANDLER) (LPEXCEPTION_POINTERS e);
+typedef LONG (WINAPI *gcPVECTORED_EXCEPTION_HANDLER) (LPEXCEPTION_POINTERS e);
 
 
 void