This small patch prevents the compiler from seeing two declarations of PrefChangedFunc (nsIPref.h and prefapi.h). Patch is relative to the nglayout branch of libpref on 10/30. --- nsIPref.h-orig Fri Oct 30 13:53:54 1998 +++ nsIPref.h Fri Oct 30 13:54:13 1998 @@ -22,8 +22,7 @@ #include "xp_core.h" #include "jsapi.h" #include "nsISupports.h" - -typedef int (*PrefChangedFunc) (const char *, void *); +#include "prefapi.h" // {A22AD7B0-CA86-11d1-A9A4-00805F8A7AC4} NS_DECLARE_ID(kIPrefIID,

Change checked in by hshaw.

[pinged hshaw to verify that it's okay to mark this as verified.

I checked in some conditional preprocessing to make sure prefchangedfunc only gets defined once. This should be temporary until we wean people off of using prefapi.h. The reason prefapi.h was not just included from nsIPref.h is because the former is in the process of becoming a private header file and in the future won't be included by any consumers of the API.