Commit 383e0970 authored by Jan D's avatar Jan D

Remove P_ and __P macros.

* lwlib/lwlib-Xaw.h: Remove P_ and __P macros.
* lwlib/lwlib-Xlw.h:
* lwlib/lwlib-Xm.h:
* lwlib/lwlib-int.h:
* lwlib/lwlib-utils.h:
* lwlib/lwlib.h: Likewise.

* src/buffer.h: Remove P_ and __P macros.
* src/category.h:
* src/ccl.h:
* src/character.h:
* src/charset.h:
* src/cm.h:
* src/coding.h:
* src/composite.h:
* src/dispextern.h:
* src/disptab.h:
* src/font.h:
* src/fontset.h:
* src/frame.h:
* src/gtkutil.h:
* src/indent.h:
* src/intervals.h:
* src/keyboard.h:
* src/keymap.h:
* src/lisp.h:
* src/macros.h:
* src/md5.h:
* src/menu.h:
* src/msdos.h:
* src/nsterm.h:
* src/puresize.h:
* src/region-cache.h:
* src/syntax.h:
* src/syssignal.h:
* src/systime.h:
* src/termhooks.h:
* src/w32term.h:
* src/widget.h:
* src/window.h:
* src/xgselect.h:
* src/xsettings.h:
* src/xterm.h: Likewise.
parent d9170db5
2010-07-02 Jan Djärv <jan.h.d@swipnet.se>
Remove P_ and __P macros.
* lwlib-Xaw.h: Remove P_ and __P macros.
* lwlib-Xlw.h:
* lwlib-Xm.h:
* lwlib-int.h:
* lwlib-utils.h:
* lwlib.h: Likewise.
2010-05-15 Glenn Morris <rgm@gnu.org> 2010-05-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (mostlyclean): Remove references to non-existent files. * Makefile.in (mostlyclean): Remove references to non-existent files.
......
...@@ -6,25 +6,25 @@ ...@@ -6,25 +6,25 @@
extern widget_creation_entry xaw_creation_table []; extern widget_creation_entry xaw_creation_table [];
Widget Widget
xaw_create_dialog __P ((widget_instance*)); xaw_create_dialog (widget_instance*);
Boolean Boolean
lw_xaw_widget_p __P ((Widget)); lw_xaw_widget_p (Widget);
void void
xaw_update_one_widget __P ((widget_instance *, Widget, widget_value *, Boolean)); xaw_update_one_widget (widget_instance *, Widget, widget_value *, Boolean);
void void
xaw_update_one_value __P ((widget_instance *, Widget, widget_value *)); xaw_update_one_value (widget_instance *, Widget, widget_value *);
void void
xaw_destroy_instance __P ((widget_instance *)); xaw_destroy_instance (widget_instance *);
void void
xaw_popup_menu __P ((Widget, XEvent *)); xaw_popup_menu (Widget, XEvent *);
void void
xaw_pop_instance __P ((widget_instance *, Boolean)); xaw_pop_instance (widget_instance *, Boolean);
#endif /* LWLIB_XAW_H */ #endif /* LWLIB_XAW_H */
......
...@@ -7,24 +7,24 @@ extern widget_creation_entry xlw_creation_table []; ...@@ -7,24 +7,24 @@ extern widget_creation_entry xlw_creation_table [];
extern widget_creation_function xlw_create_dialog; extern widget_creation_function xlw_create_dialog;
Boolean Boolean
lw_lucid_widget_p __P ((Widget widget)); lw_lucid_widget_p (Widget widget);
void void
xlw_update_one_widget __P ((widget_instance* instance, Widget widget, xlw_update_one_widget (widget_instance* instance, Widget widget,
widget_value* val, Boolean deep_p)); widget_value* val, Boolean deep_p);
void void
xlw_update_one_value __P ((widget_instance* instance, Widget widget, xlw_update_one_value (widget_instance* instance, Widget widget,
widget_value* val)); widget_value* val);
void void
xlw_destroy_instance __P ((widget_instance* instance)); xlw_destroy_instance (widget_instance* instance);
void void
xlw_pop_instance __P ((widget_instance* instance, Boolean up)); xlw_pop_instance (widget_instance* instance, Boolean up);
void void
xlw_popup_menu __P ((Widget widget, XEvent * event)); xlw_popup_menu (Widget widget, XEvent * event);
#endif /* LWLIB_XLW_H */ #endif /* LWLIB_XLW_H */
......
...@@ -26,36 +26,36 @@ Boston, MA 02110-1301, USA. */ ...@@ -26,36 +26,36 @@ Boston, MA 02110-1301, USA. */
extern widget_creation_entry xm_creation_table []; extern widget_creation_entry xm_creation_table [];
Widget Widget
xm_create_dialog __P ((widget_instance* instance)); xm_create_dialog (widget_instance* instance);
Boolean Boolean
lw_motif_widget_p __P ((Widget widget)); lw_motif_widget_p (Widget widget);
void void
xm_update_one_widget __P ((widget_instance* instance, Widget widget, xm_update_one_widget (widget_instance* instance, Widget widget,
widget_value* val, Boolean deep_p)); widget_value* val, Boolean deep_p);
void void
xm_update_one_value __P ((widget_instance* instance, Widget widget, xm_update_one_value (widget_instance* instance, Widget widget,
widget_value* val)); widget_value* val);
void void
xm_destroy_instance __P ((widget_instance* instance)); xm_destroy_instance (widget_instance* instance);
void void
xm_set_keyboard_focus __P ((Widget parent, Widget w)); xm_set_keyboard_focus (Widget parent, Widget w);
void void
xm_popup_menu __P ((Widget widget, XEvent *event)); xm_popup_menu (Widget widget, XEvent *event);
void void
xm_pop_instance __P ((widget_instance* instance, Boolean up)); xm_pop_instance (widget_instance* instance, Boolean up);
void void
xm_set_main_areas __P ((Widget parent, Widget menubar, Widget work_area)); xm_set_main_areas (Widget parent, Widget menubar, Widget work_area);
void void
xm_manage_resizing __P ((Widget w, Boolean flag)); xm_manage_resizing (Widget w, Boolean flag);
#endif /* LWLIB_XM_H */ #endif /* LWLIB_XM_H */
......
...@@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA. */ ...@@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA. */
#include "lwlib.h" #include "lwlib.h"
extern char *safe_strdup __P ((const char *)); extern char *safe_strdup (const char *);
struct widget_xft_data; struct widget_xft_data;
...@@ -70,14 +70,14 @@ typedef struct _widget_creation_entry ...@@ -70,14 +70,14 @@ typedef struct _widget_creation_entry
/* update all other instances of a widget. Can be used in a callback when /* update all other instances of a widget. Can be used in a callback when
a widget has been used by the user */ a widget has been used by the user */
void void
lw_internal_update_other_instances __P ((Widget, XtPointer, XtPointer)); lw_internal_update_other_instances (Widget, XtPointer, XtPointer);
/* get the widget_value for a widget in a given instance */ /* get the widget_value for a widget in a given instance */
widget_value* widget_value*
lw_get_widget_value_for_widget __P ((widget_instance *, Widget)); lw_get_widget_value_for_widget (widget_instance *, Widget);
widget_info *lw_get_widget_info __P ((LWLIB_ID)); widget_info *lw_get_widget_info (LWLIB_ID);
widget_instance * lw_get_widget_instance __P ((Widget)); widget_instance * lw_get_widget_instance (Widget);
#endif /* LWLIB_INTERNAL_H */ #endif /* LWLIB_INTERNAL_H */
......
#ifndef _LWLIB_UTILS_H_ #ifndef _LWLIB_UTILS_H_
#define _LWLIB_UTILS_H_ #define _LWLIB_UTILS_H_
void XtNoClearRefreshWidget __P ((Widget)); void XtNoClearRefreshWidget (Widget);
typedef void (*XtApplyToWidgetsProc) __P ((Widget, XtPointer)); typedef void (*XtApplyToWidgetsProc) (Widget, XtPointer);
typedef void* (*XtApplyUntilToWidgetsProc) __P ((Widget, XtPointer)); typedef void* (*XtApplyUntilToWidgetsProc) (Widget, XtPointer);
void XtApplyToWidgets __P ((Widget, XtApplyToWidgetsProc, XtPointer)); void XtApplyToWidgets (Widget, XtApplyToWidgetsProc, XtPointer);
void *XtApplyUntilToWidgets __P ((Widget, XtApplyUntilToWidgetsProc, XtPointer)); void *XtApplyUntilToWidgets (Widget, XtApplyUntilToWidgetsProc, XtPointer);
Widget *XtCompositeChildren __P ((Widget, unsigned int *)); Widget *XtCompositeChildren (Widget, unsigned int *);
/* returns True is the widget is being destroyed, False otherwise */ /* returns True is the widget is being destroyed, False otherwise */
Boolean Boolean
XtWidgetBeingDestroyedP __P ((Widget widget)); XtWidgetBeingDestroyedP (Widget widget);
void XtSafelyDestroyWidget __P ((Widget)); void XtSafelyDestroyWidget (Widget);
#endif /* _LWLIB_UTILS_H_ */ #endif /* _LWLIB_UTILS_H_ */
......
...@@ -130,66 +130,66 @@ typedef struct _widget_value ...@@ -130,66 +130,66 @@ typedef struct _widget_value
} widget_value; } widget_value;
typedef void (*lw_callback) __P ((Widget w, LWLIB_ID id, void* data)); typedef void (*lw_callback) (Widget w, LWLIB_ID id, void* data);
void lw_register_widget __P ((char* type, char* name, LWLIB_ID id, void lw_register_widget (char* type, char* name, LWLIB_ID id,
widget_value* val, lw_callback pre_activate_cb, widget_value* val, lw_callback pre_activate_cb,
lw_callback selection_cb, lw_callback selection_cb,
lw_callback post_activate_cb, lw_callback post_activate_cb,
lw_callback highlight_cb)); lw_callback highlight_cb);
Widget lw_get_widget __P ((LWLIB_ID id, Widget parent, Boolean pop_up_p)); Widget lw_get_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p);
Widget lw_make_widget __P ((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 __P ((char* type, char* name, LWLIB_ID id, Widget lw_create_widget (char* type, char* name, LWLIB_ID id,
widget_value* val, Widget parent, Boolean pop_up_p, widget_value* val, Widget parent, Boolean pop_up_p,
lw_callback pre_activate_cb, lw_callback pre_activate_cb,
lw_callback selection_cb, lw_callback selection_cb,
lw_callback post_activate_cb, lw_callback post_activate_cb,
lw_callback highlight_cb)); lw_callback highlight_cb);
LWLIB_ID lw_get_widget_id __P ((Widget w)); LWLIB_ID lw_get_widget_id (Widget w);
int lw_modify_all_widgets __P ((LWLIB_ID id, widget_value* val, Boolean deep_p)); int lw_modify_all_widgets (LWLIB_ID id, widget_value* val, Boolean deep_p);
void lw_destroy_widget __P ((Widget w)); void lw_destroy_widget (Widget w);
void lw_destroy_all_widgets __P ((LWLIB_ID id)); void lw_destroy_all_widgets (LWLIB_ID id);
void lw_destroy_everything __P ((void)); void lw_destroy_everything (void);
void lw_destroy_all_pop_ups __P ((void)); void lw_destroy_all_pop_ups (void);
Widget lw_raise_all_pop_up_widgets __P ((void)); Widget lw_raise_all_pop_up_widgets (void);
widget_value* lw_get_all_values __P ((LWLIB_ID id)); widget_value* lw_get_all_values (LWLIB_ID id);
Boolean lw_get_some_values __P ((LWLIB_ID id, widget_value* val)); Boolean lw_get_some_values (LWLIB_ID id, widget_value* val);
void lw_pop_up_all_widgets __P ((LWLIB_ID id)); void lw_pop_up_all_widgets (LWLIB_ID id);
void lw_pop_down_all_widgets __P ((LWLIB_ID id)); void lw_pop_down_all_widgets (LWLIB_ID id);
widget_value *malloc_widget_value (); widget_value *malloc_widget_value ();
void free_widget_value __P ((widget_value *)); void free_widget_value (widget_value *);
void lw_popup_menu __P ((Widget, XEvent *)); void lw_popup_menu (Widget, XEvent *);
/* Toolkit independent way of focusing on a Widget at the Xt level. */ /* Toolkit independent way of focusing on a Widget at the Xt level. */
void lw_set_keyboard_focus __P ((Widget parent, Widget w)); void lw_set_keyboard_focus (Widget parent, Widget w);
/* Silly Energize hack to invert the "sheet" button */ /* Silly Energize hack to invert the "sheet" button */
void lw_show_busy __P ((Widget w, Boolean busy)); void lw_show_busy (Widget w, Boolean busy);
/* Silly hack to assist with Lucid/Athena geometry management. */ /* Silly hack to assist with Lucid/Athena geometry management. */
void lw_refigure_widget __P ((Widget w, Boolean doit)); void lw_refigure_widget (Widget w, Boolean doit);
/* Toolkit independent way of determining if an event occurred on a /* Toolkit independent way of determining if an event occurred on a
menubar. */ menubar. */
Boolean lw_window_is_in_menubar __P ((Window win, Widget menubar_widget)); Boolean lw_window_is_in_menubar (Window win, Widget menubar_widget);
/* Manage resizing: TRUE permits resizing widget w; FALSE disallows it. */ /* Manage resizing: TRUE permits resizing widget w; FALSE disallows it. */
void lw_allow_resizing __P ((Widget w, Boolean flag)); void lw_allow_resizing (Widget w, Boolean flag);
/* Set up the main window. */ /* Set up the main window. */
void lw_set_main_areas __P ((Widget parent, void lw_set_main_areas (Widget parent,
Widget menubar, Widget menubar,
Widget work_area)); Widget work_area);
/* Value is non-zero if LABEL is a menu separator. If it is, *TYPE is /* Value is non-zero if LABEL is a menu separator. If it is, *TYPE is
set to an appropriate enumerator of type enum menu_separator. set to an appropriate enumerator of type enum menu_separator.
MOTIF_P non-zero means map separator types not supported by Motif MOTIF_P non-zero means map separator types not supported by Motif
to similar ones that are supported. */ to similar ones that are supported. */
int lw_separator_p __P ((char *label, enum menu_separator *type, int lw_separator_p (char *label, enum menu_separator *type,
int motif_p)); int motif_p);
void lwlib_bcopy __P ((char*, char*, int)); void lwlib_bcopy (char*, char*, int);
#endif /* LWLIB_H */ #endif /* LWLIB_H */
......
2010-07-02 Jan Djärv <jan.h.d@swipnet.se>
Remove P_ and __P macros.
* buffer.h: Remove P_ and __P macros.
* category.h:
* ccl.h:
* character.h:
* charset.h:
* cm.h:
* coding.h:
* composite.h:
* dispextern.h:
* disptab.h:
* font.h:
* fontset.h:
* frame.h:
* gtkutil.h:
* indent.h:
* intervals.h:
* keyboard.h:
* keymap.h:
* lisp.h:
* macros.h:
* md5.h:
* menu.h:
* msdos.h:
* nsterm.h:
* puresize.h:
* region-cache.h:
* syntax.h:
* syssignal.h:
* systime.h:
* termhooks.h:
* w32term.h:
* widget.h:
* window.h:
* xgselect.h:
* xsettings.h:
* xterm.h: Likewise.
2010-07-02 Dan Nicolaescu <dann@ics.uci.edu> 2010-07-02 Dan Nicolaescu <dann@ics.uci.edu>
* lisp.h: Document that USE_LISP_UNION_TYPE is now enabled using autoconf. * lisp.h: Document that USE_LISP_UNION_TYPE is now enabled using autoconf.
......
...@@ -49,7 +49,7 @@ enum atimer_type ...@@ -49,7 +49,7 @@ enum atimer_type
/* Type of timer callback functions. */ /* Type of timer callback functions. */
typedef void (* atimer_callback) P_ ((struct atimer *timer)); typedef void (* atimer_callback) (struct atimer *timer);
/* Structure describing an asynchronous timer. */ /* Structure describing an asynchronous timer. */
...@@ -77,15 +77,15 @@ struct atimer ...@@ -77,15 +77,15 @@ struct atimer
/* Function prototypes. */ /* Function prototypes. */
struct atimer *start_atimer P_ ((enum atimer_type, EMACS_TIME, struct atimer *start_atimer (enum atimer_type, EMACS_TIME,
atimer_callback, void *)); atimer_callback, void *);
void cancel_atimer P_ ((struct atimer *)); void cancel_atimer (struct atimer *);
void do_pending_atimers P_ ((void)); void do_pending_atimers (void);
void init_atimer P_ ((void)); void init_atimer (void);
void turn_on_atimers P_ ((int)); void turn_on_atimers (int);
void stop_other_atimers P_ ((struct atimer *)); void stop_other_atimers (struct atimer *);
void run_all_atimers P_ ((void)); void run_all_atimers (void);
Lisp_Object unwind_stop_other_atimers P_ ((Lisp_Object)); Lisp_Object unwind_stop_other_atimers (Lisp_Object);
#endif /* EMACS_ATIMER_H */ #endif /* EMACS_ATIMER_H */
......
...@@ -225,12 +225,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -225,12 +225,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BUF_TEMP_SET_PT(buffer, position) \ #define BUF_TEMP_SET_PT(buffer, position) \
(temp_set_point ((buffer), (position))) (temp_set_point ((buffer), (position)))
extern void set_point P_ ((EMACS_INT)); extern void set_point (EMACS_INT);
extern INLINE void temp_set_point P_ ((struct buffer *, EMACS_INT)); extern INLINE void temp_set_point (struct buffer *, EMACS_INT);
extern void set_point_both P_ ((EMACS_INT, EMACS_INT)); extern void set_point_both (EMACS_INT, EMACS_INT);
extern INLINE void temp_set_point_both P_ ((struct buffer *, extern INLINE void temp_set_point_both (struct buffer *,
EMACS_INT, EMACS_INT)); EMACS_INT, EMACS_INT);
extern void enlarge_buffer_text P_ ((struct buffer *, EMACS_INT)); extern void enlarge_buffer_text (struct buffer *, EMACS_INT);
/* Macros for setting the BEGV, ZV or PT of a given buffer. /* Macros for setting the BEGV, ZV or PT of a given buffer.
...@@ -857,23 +857,23 @@ extern struct buffer buffer_local_flags; ...@@ -857,23 +857,23 @@ extern struct buffer buffer_local_flags;
extern struct buffer buffer_local_symbols; extern struct buffer buffer_local_symbols;
extern void delete_all_overlays P_ ((struct buffer *)); extern void delete_all_overlays (struct buffer *);
extern void reset_buffer P_ ((struct buffer *)); extern void reset_buffer (struct buffer *);
extern void evaporate_overlays P_ ((EMACS_INT)); extern void evaporate_overlays (EMACS_INT);
extern int overlays_at P_ ((EMACS_INT pos, int extend, Lisp_Object **vec_ptr, extern int overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr,
int *len_ptr, EMACS_INT *next_ptr, int *len_ptr, EMACS_INT *next_ptr,
EMACS_INT *prev_ptr, int change_req)); EMACS_INT *prev_ptr, int change_req);
extern int sort_overlays P_ ((Lisp_Object *, int, struct window *)); extern int sort_overlays (Lisp_Object *, int, struct window *);
extern void recenter_overlay_lists P_ ((struct buffer *, EMACS_INT)); extern void recenter_overlay_lists (struct buffer *, EMACS_INT);
extern int overlay_strings P_ ((EMACS_INT, struct window *, unsigned char **)); extern int overlay_strings (EMACS_INT, struct window *, unsigned char **);
extern void validate_region P_ ((Lisp_Object *, Lisp_Object *)); extern void validate_region (Lisp_Object *, Lisp_Object *);
extern void set_buffer_internal P_ ((struct buffer *)); extern void set_buffer_internal (struct buffer *);
extern void set_buffer_internal_1 P_ ((struct buffer *)); extern void set_buffer_internal_1 (struct buffer *);
extern void set_buffer_temp P_ ((struct buffer *)); extern void set_buffer_temp (struct buffer *);
extern void record_buffer P_ ((Lisp_Object)); extern void record_buffer (Lisp_Object);
extern void buffer_slot_type_mismatch P_ ((Lisp_Object, int)) NO_RETURN; extern void buffer_slot_type_mismatch (Lisp_Object, int) NO_RETURN;
extern void fix_overlays_before P_ ((struct buffer *, EMACS_INT, EMACS_INT)); extern void fix_overlays_before (struct buffer *, EMACS_INT, EMACS_INT);
extern void mmap_set_vars P_ ((int)); extern void mmap_set_vars (int);
/* Get overlays at POSN into array OVERLAYS with NOVERLAYS elements. /* Get overlays at POSN into array OVERLAYS with NOVERLAYS elements.
If NEXTP is non-NULL, return next overlay there. If NEXTP is non-NULL, return next overlay there.
......
...@@ -113,8 +113,8 @@ extern Lisp_Object _temp_category_set; ...@@ -113,8 +113,8 @@ extern Lisp_Object _temp_category_set;
(!(SINGLE_BYTE_CHAR_P (c1) && SINGLE_BYTE_CHAR_P (c2)) \ (!(SINGLE_BYTE_CHAR_P (c1) && SINGLE_BYTE_CHAR_P (c2)) \
&& word_boundary_p (c1, c2)) && word_boundary_p (c1, c2))
extern int word_boundary_p P_ ((int, int)); extern int word_boundary_p (int, int);
extern void set_category_set P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); extern void set_category_set (Lisp_Object, Lisp_Object, Lisp_Object);
/* arch-tag: 309dfe83-c3e2-4d22-8e81-faae5aece0ff /* arch-tag: 309dfe83-c3e2-4d22-8e81-faae5aece0ff
(do not change this comment) */ (do not change this comment) */
...@@ -97,13 +97,13 @@ extern Lisp_Object Vfont_ccl_encoder_alist; ...@@ -97,13 +97,13 @@ extern Lisp_Object Vfont_ccl_encoder_alist;
/* Setup fields of the structure pointed by CCL appropriately for the /* Setup fields of the structure pointed by CCL appropriately for the
execution of ccl program CCL_PROG (symbol or vector). */ execution of ccl program CCL_PROG (symbol or vector). */
extern int setup_ccl_program P_ ((struct ccl_program *, Lisp_Object)); extern int setup_ccl_program (struct ccl_program *, Lisp_Object);
/* Check if CCL is updated or not. If not, re-setup members of CCL. */ /* Check if CCL is updated or not. If not, re-setup members of CCL. */
extern int check_ccl_update P_ ((struct ccl_program *)); extern int check_ccl_update (struct ccl_program *);
extern void ccl_driver P_ ((struct ccl_program *, int *, int *, int, int, extern void ccl_driver (struct ccl_program *, int *, int *, int, int,
Lisp_Object)); Lisp_Object);
/* Vector of CCL program names vs corresponding program data. */ /* Vector of CCL program names vs corresponding program data. */
extern Lisp_Object Vccl_program_table; extern Lisp_Object Vccl_program_table;
......
...@@ -596,24 +596,24 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -596,24 +596,24 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
: 0) : 0)
extern int char_resolve_modifier_mask P_ ((int)); extern int char_resolve_modifier_mask (int);
extern int char_string P_ ((unsigned, unsigned char *)); extern int char_string (unsigned, unsigned char *);
extern int string_char P_ ((const unsigned char *, extern int string_char (const unsigned char *,
const unsigned char **, int *)); const unsigned char **, int *);
extern int translate_char P_ ((Lisp_Object, int c)); extern int translate_char (Lisp_Object, int c);
extern int char_printable_p P_ ((int c)); extern int char_printable_p (int c);
extern void parse_str_as_multibyte P_ ((const unsigned char *, int, int *, extern void parse_str_as_multibyte (const unsigned char *, int, int *,
int *)); int *);
extern int parse_str_to_multibyte P_ ((unsigned char *, int)); extern int parse_str_to_multibyte (unsigned char *, int);
extern int str_as_multibyte P_ ((unsigned char *, int, int, int *)); extern int str_as_multibyte (unsigned char *, int, int, int *);
extern int str_to_multibyte P_ ((unsigned char *, int, int)); extern int str_to_multibyte (unsigned char *, int, int);
extern int str_as_unibyte P_ ((unsigned char *, int)); extern int str_as_unibyte (unsigned char *, int);
extern EMACS_INT str_to_unibyte P_ ((const unsigned char *, unsigned char *, extern EMACS_INT str_to_unibyte (const unsigned char *, unsigned char *,
EMACS_INT, int)); EMACS_INT, int);
extern int strwidth P_ ((unsigned char *, int)); extern int strwidth (unsigned char *, int);
extern int c_string_width P_ ((const unsigned char *, int, int, int *, int *)); extern int c_string_width (const unsigned char *, int, int, int *, int *);
extern int lisp_string_width P_ ((Lisp_Object, int, int *, int *)); extern int lisp_string_width (Lisp_Object, int, int *, int *);
extern Lisp_Object Vprintable_chars; extern Lisp_Object Vprintable_chars;
...@@ -624,7 +624,7 @@ extern Lisp_Object Vchar_direction_table; ...@@ -624,7 +624,7 @@ extern Lisp_Object Vchar_direction_table;
extern Lisp_Object Vchar_unify_table; extern Lisp_Object Vchar_unify_table;
extern Lisp_Object Vunicode_category_table; extern Lisp_Object Vunicode_category_table;
extern Lisp_Object string_escape_byte8 P_ ((Lisp_Object)); extern Lisp_Object string_escape_byte8 (Lisp_Object);
/* Return a translation table of id number ID. */ /* Return a translation table of id number ID. */
#define GET_TRANSLATION_TABLE(id) \ #define GET_TRANSLATION_TABLE(id) \
......
...@@ -534,17 +534,17 @@ extern int charset_ksc5601; ...@@ -534,17 +534,17 @@ extern int charset_ksc5601;
extern int charset_unibyte; extern int charset_unibyte;
extern struct charset *char_charset P_ ((int, Lisp_Object, unsigned *)); extern struct charset *char_charset (int, Lisp_Object, unsigned *);
extern Lisp_Object charset_attributes P_ ((int)); extern Lisp_Object charset_attributes (int);
extern int maybe_unify_char P_ ((int, Lisp_Object)); extern int maybe_unify_char (int, Lisp_Object);
extern int decode_char P_ ((struct charset *, unsigned)); extern int decode_char (struct charset *, unsigned);
extern unsigned encode_char P_ ((struct charset *, int)); extern unsigned encode_char (struct charset *, int);
extern int string_xstring_p P_ ((Lisp_Object));