(SYSTEM_TYPE): Use berkeley-unix.

[gnu-emacs] / src / xrdb.c

diff --git a/src/xrdb.c b/src/xrdb.c
index 02e28f30cd383c2165fa1d14cef0377d8a02f8ec..f241a079c4e8b397f42a9c68e638e80e996cce39 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -29,7 +29,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif /* USG5 */
 
 #endif /* 1 */
- 
+
+/* This should be included before the X include files; otherwise, we get
+   warnings about redefining NULL under BSD 4.3.  */
+#include <sys/param.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #if 0
@@ -38,7 +42,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <X11/X.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
-#include <sys/param.h>
 #ifdef VMS
 #include "vms-pwd.h"
 #else
@@ -400,7 +403,7 @@ x_get_resource (rdb, name, class, expected_type, ret_value)
       && (type == expected_type))
     {
       if (type == x_rm_string)
-       (char *) ret_value->addr = value.addr;
+       ret_value->addr = (char *) value.addr;
       else
        bcopy (value.addr, ret_value->addr, ret_value->size);