XEmacs 21.2.29 "Hestia".

[chise/xemacs-chise.git.1] / lwlib / lwlib.h

diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h
index 882348d..458e499 100644 (file)
--- a/lwlib/lwlib.h
+++ b/lwlib/lwlib.h
@@ -1,17 +1,8 @@
-#ifndef LWLIB_H
-#define LWLIB_H
-
-#undef CONST
+#ifndef INCLUDED_lwlib_h_
+#define INCLUDED_lwlib_h_
 
 #include <X11/Intrinsic.h>
 
-/* To eliminate use of `const' in the lwlib sources, define CONST_IS_LOSING. */
-#ifdef CONST_IS_LOSING
-# define CONST
-#else
-# define CONST const
-#endif
-
 #if defined (LWLIB_MENUBARS_LUCID) || defined (LWLIB_MENUBARS_MOTIF) || defined (LWLIB_MENUBARS_ATHENA)
 #define NEED_MENUBARS
 #endif
@@ -193,13 +184,13 @@ extern int lw_menu_active;
 #include "xlwtabs.h"
 #endif
 
-void  lw_register_widget (CONST char* type, CONST char* name, LWLIB_ID id,
+void  lw_register_widget (const char* type, const char* name, LWLIB_ID id,
                          widget_value* val, lw_callback pre_activate_cb,
                          lw_callback selection_cb,
                          lw_callback post_activate_cb);
 Widget lw_get_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p);
 Widget lw_make_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p);
-Widget lw_create_widget (CONST char* type, CONST char* name, LWLIB_ID id,
+Widget lw_create_widget (const char* type, const char* name, LWLIB_ID id,
                         widget_value* val, Widget parent, Boolean pop_up_p,
                         lw_callback pre_activate_cb,
                         lw_callback selection_cb,
@@ -235,4 +226,4 @@ void lw_set_keyboard_focus (Widget parent, Widget w);
  /* Silly Energize hack to invert the "sheet" button */
 void lw_show_busy (Widget w, Boolean busy);
 
-#endif /* LWLIB_H */
+#endif /* INCLUDED_lwlib_h_ */