Use proper max in lwlib

[sxemacs] / src / ui / lwlib / lwlib.c

diff --git a/src/ui/lwlib/lwlib.c b/src/ui/lwlib/lwlib.c
index 8730a4e..b23e76d 100644 (file)
--- a/src/ui/lwlib/lwlib.c
+++ b/src/ui/lwlib/lwlib.c
@@ -324,8 +324,8 @@ widget_value *replace_widget_value_tree(widget_value * node,
 
                free_widget_value_contents(node);
                *node = *copy;
-                /* free the node, but not its contents. */
-               free_widget_value(copy);        
+               /* free the node, but not its contents. */
+               free_widget_value(copy);
        }
        return node;
 }
@@ -500,6 +500,12 @@ static Boolean safe_strcmp(const char *s1, const char *s2)
        return (s1 && s2) ? strcmp(s1, s2) : s1 ? False : !!s2;
 }
 
+
+/* We only expect to use the following max function */
+#ifdef max
+#undef max
+#endif
+
 static change_type max(change_type i1, change_type i2)
 {
        return (int)i1 > (int)i2 ? i1 : i2;
@@ -898,10 +904,10 @@ static void instantiate_widget_instance(widget_instance * instance)
                fprintf(stderr, "No creation function for widget type %s\n",
                        instance->info->type);
                abort();
+       } else {
+               instance->widget = (*function) (instance);
        }
 
-       instance->widget = (*function) (instance);
-
        if (!instance->widget)
                abort();