--- lib/libxview/frame/fm_props.h.orig 1993-06-29 07:16:14.000000000 +0200 +++ lib/libxview/frame/fm_props.h 2003-12-30 01:31:12.000000000 +0100 @@ -13,11 +13,16 @@ #define _frame_props_h_already_included /* standard includes */ +#ifdef NULL +#undef NULL +#endif #ifndef FILE #ifndef SVR4 -#undef NULL #endif SVR4 #include +#ifndef NULL +#define NULL 0 +#endif #endif FILE #include #include