diff options
| author | Jan D | 2010-07-02 14:19:53 +0200 |
|---|---|---|
| committer | Jan D | 2010-07-02 14:19:53 +0200 |
| commit | f57e2426f0e8a6b251be71b6f62237fd286998ea (patch) | |
| tree | a8db36e415ea69b4196881b44122454317510f46 /src/ftfont.c | |
| parent | 383e09700c9b3d175c506301d363be4597827db7 (diff) | |
| download | emacs-f57e2426f0e8a6b251be71b6f62237fd286998ea.tar.gz emacs-f57e2426f0e8a6b251be71b6f62237fd286998ea.zip | |
Remove __P and P_ from .c and .m files and definition of P_
* lisp.h:
* atimer.h: Remove define for P_.
* alloc.c: Remove __P and P_ from .c and .m files.
* atimer.c:
* buffer.c:
* callint.c:
* category.c:
* charset.c:
* chartab.c:
* cm.c:
* coding.c:
* composite.c:
* data.c:
* dired.c:
* dispnew.c:
* doc.c:
* editfns.c:
* emacs.c:
* eval.c:
* fileio.c:
* filelock.c:
* fns.c:
* font.c:
* fontset.c:
* frame.c:
* ftfont.c:
* ftxfont.c:
* gmalloc.c:
* gtkutil.c:
* image.c:
* indent.c:
* intervals.c:
* keyboard.c:
* keymap.c:
* lread.c:
* marker.c:
* menu.c:
* minibuf.c:
* print.c:
* process.c:
* scroll.c:
* search.c:
* sound.c:
* strftime.c:
* syntax.c:
* sysdep.c:
* term.c:
* terminal.c:
* textprop.c:
* unexalpha.c:
* w32console.c:
* w32fns.c:
* w32font.c:
* w32menu.c:
* w32term.c:
* w32uniscribe.c:
* window.c:
* xdisp.c:
* xfaces.c:
* xfns.c:
* xfont.c:
* xftfont.c:
* xmenu.c:
* xselect.c:
* xterm.c: Likewise.
* ebrowse.c: Remove P_ and __P.
* etags.c:
* movemail.c:
* pop.c:
* update-game-score.c: Likewise.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 33a96143fd0..a75296cc7b7 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -80,16 +80,16 @@ enum ftfont_cache_for | |||
| 80 | FTFONT_CACHE_FOR_ENTITY | 80 | FTFONT_CACHE_FOR_ENTITY |
| 81 | }; | 81 | }; |
| 82 | 82 | ||
| 83 | static Lisp_Object ftfont_pattern_entity P_ ((FcPattern *, Lisp_Object)); | 83 | static Lisp_Object ftfont_pattern_entity (FcPattern *, Lisp_Object); |
| 84 | 84 | ||
| 85 | static Lisp_Object ftfont_resolve_generic_family P_ ((Lisp_Object, | 85 | static Lisp_Object ftfont_resolve_generic_family (Lisp_Object, |
| 86 | FcPattern *)); | 86 | FcPattern *); |
| 87 | static Lisp_Object ftfont_lookup_cache P_ ((Lisp_Object, | 87 | static Lisp_Object ftfont_lookup_cache (Lisp_Object, |
| 88 | enum ftfont_cache_for)); | 88 | enum ftfont_cache_for); |
| 89 | 89 | ||
| 90 | static void ftfont_filter_properties P_ ((Lisp_Object font, Lisp_Object alist)); | 90 | static void ftfont_filter_properties (Lisp_Object font, Lisp_Object alist); |
| 91 | 91 | ||
| 92 | Lisp_Object ftfont_font_format P_ ((FcPattern *, Lisp_Object)); | 92 | Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object); |
| 93 | 93 | ||
| 94 | #define SYMBOL_FcChar8(SYM) (FcChar8 *) SDATA (SYMBOL_NAME (SYM)) | 94 | #define SYMBOL_FcChar8(SYM) (FcChar8 *) SDATA (SYMBOL_NAME (SYM)) |
| 95 | 95 | ||
| @@ -486,26 +486,26 @@ ftfont_get_otf (ftfont_info) | |||
| 486 | } | 486 | } |
| 487 | #endif /* HAVE_LIBOTF */ | 487 | #endif /* HAVE_LIBOTF */ |
| 488 | 488 | ||
| 489 | static Lisp_Object ftfont_get_cache P_ ((FRAME_PTR)); | 489 | static Lisp_Object ftfont_get_cache (FRAME_PTR); |
| 490 | static Lisp_Object ftfont_list P_ ((Lisp_Object, Lisp_Object)); | 490 | static Lisp_Object ftfont_list (Lisp_Object, Lisp_Object); |
| 491 | static Lisp_Object ftfont_match P_ ((Lisp_Object, Lisp_Object)); | 491 | static Lisp_Object ftfont_match (Lisp_Object, Lisp_Object); |
| 492 | static Lisp_Object ftfont_list_family P_ ((Lisp_Object)); | 492 | static Lisp_Object ftfont_list_family (Lisp_Object); |
| 493 | static Lisp_Object ftfont_open P_ ((FRAME_PTR, Lisp_Object, int)); | 493 | static Lisp_Object ftfont_open (FRAME_PTR, Lisp_Object, int); |
| 494 | static void ftfont_close P_ ((FRAME_PTR, struct font *)); | 494 | static void ftfont_close (FRAME_PTR, struct font *); |
| 495 | static int ftfont_has_char P_ ((Lisp_Object, int)); | 495 | static int ftfont_has_char (Lisp_Object, int); |
| 496 | static unsigned ftfont_encode_char P_ ((struct font *, int)); | 496 | static unsigned ftfont_encode_char (struct font *, int); |
| 497 | static int ftfont_text_extents P_ ((struct font *, unsigned *, int, | 497 | static int ftfont_text_extents (struct font *, unsigned *, int, |
| 498 | struct font_metrics *)); | 498 | struct font_metrics *); |
| 499 | static int ftfont_get_bitmap P_ ((struct font *, unsigned, | 499 | static int ftfont_get_bitmap (struct font *, unsigned, |
| 500 | struct font_bitmap *, int)); | 500 | struct font_bitmap *, int); |
| 501 | static int ftfont_anchor_point P_ ((struct font *, unsigned, int, | 501 | static int ftfont_anchor_point (struct font *, unsigned, int, |
| 502 | int *, int *)); | 502 | int *, int *); |
| 503 | static Lisp_Object ftfont_otf_capability P_ ((struct font *)); | 503 | static Lisp_Object ftfont_otf_capability (struct font *); |
| 504 | static Lisp_Object ftfont_shape P_ ((Lisp_Object)); | 504 | static Lisp_Object ftfont_shape (Lisp_Object); |
| 505 | 505 | ||
| 506 | #ifdef HAVE_OTF_GET_VARIATION_GLYPHS | 506 | #ifdef HAVE_OTF_GET_VARIATION_GLYPHS |
| 507 | static int ftfont_variation_glyphs P_ ((struct font *, int c, | 507 | static int ftfont_variation_glyphs (struct font *, int c, |
| 508 | unsigned variations[256])); | 508 | unsigned variations[256]); |
| 509 | #endif /* HAVE_OTF_GET_VARIATION_GLYPHS */ | 509 | #endif /* HAVE_OTF_GET_VARIATION_GLYPHS */ |
| 510 | 510 | ||
| 511 | struct font_driver ftfont_driver = | 511 | struct font_driver ftfont_driver = |
| @@ -705,9 +705,9 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec) | |||
| 705 | return spec; | 705 | return spec; |
| 706 | } | 706 | } |
| 707 | 707 | ||
| 708 | static FcPattern *ftfont_spec_pattern P_ ((Lisp_Object, char *, | 708 | static FcPattern *ftfont_spec_pattern (Lisp_Object, char *, |
| 709 | struct OpenTypeSpec **, | 709 | struct OpenTypeSpec **, |
| 710 | char **langname)); | 710 | char **langname); |
| 711 | 711 | ||
| 712 | static FcPattern * | 712 | static FcPattern * |
| 713 | ftfont_spec_pattern (spec, otlayout, otspec, langname) | 713 | ftfont_spec_pattern (spec, otlayout, otspec, langname) |