diff --git a/ChangeLog b/ChangeLog
index afab21e5e..57a294de0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-13  Richard Frith-Macdoanld <rfm@gnu.org>
+
+	* Headers/AppKit/NSGraphics.h: Fix prototype for stricter compiler.
+	* Source/Functions.m: ditto
+	Deal with bug #12296
+
 2005-03-10  Nicola Pero <n.pero@mi.flashnet.it>
 
 	* Headers/AppKit/AppKitDefines.h (GS_EXPORT): Use extern, not
diff --git a/Headers/AppKit/NSGraphics.h b/Headers/AppKit/NSGraphics.h
index 61db21342..8599ef223 100644
--- a/Headers/AppKit/NSGraphics.h
+++ b/Headers/AppKit/NSGraphics.h
@@ -248,7 +248,7 @@ APPKIT_EXPORT void NSDrawWindowBackground(NSRect aRect);
 
 // Context information
 APPKIT_EXPORT void NSCountWindowsForContext(int context, int *count);
-APPKIT_EXPORT void NSWindowListForContext(int context, int size, int list[][]);
+APPKIT_EXPORT void NSWindowListForContext(int context, int size, int **list);
 APPKIT_EXPORT int NSGetWindowServerMemory(int context, int *virtualMemory, 
 					   int *windowBackingMemory, 
 					   NSString **windowDumpStream);
diff --git a/Source/Functions.m b/Source/Functions.m
index 6b784b3f6..b4fbb3a97 100644
--- a/Source/Functions.m
+++ b/Source/Functions.m
@@ -825,7 +825,7 @@ NSShowSystemInfoPanel(NSDictionary *options)
 }
 
 void 
-NSWindowListForContext(int context, int size, int list[][])
+NSWindowListForContext(int context, int size, int **list)
 {
 // TODO
 }