aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorJan D2010-07-02 14:19:53 +0200
committerJan D2010-07-02 14:19:53 +0200
commitf57e2426f0e8a6b251be71b6f62237fd286998ea (patch)
treea8db36e415ea69b4196881b44122454317510f46 /src/alloc.c
parent383e09700c9b3d175c506301d363be4597827db7 (diff)
downloademacs-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/alloc.c')
-rw-r--r--src/alloc.c92
1 files changed, 46 insertions, 46 deletions
diff --git a/src/alloc.c b/src/alloc.c
index e0f07cc5f5a..84b9007cdd5 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -329,23 +329,23 @@ Lisp_Object Vpost_gc_hook, Qpost_gc_hook;
329Lisp_Object Vgc_elapsed; /* accumulated elapsed time in GC */ 329Lisp_Object Vgc_elapsed; /* accumulated elapsed time in GC */
330EMACS_INT gcs_done; /* accumulated GCs */ 330EMACS_INT gcs_done; /* accumulated GCs */
331 331
332static void mark_buffer P_ ((Lisp_Object)); 332static void mark_buffer (Lisp_Object);
333static void mark_terminals P_ ((void)); 333static void mark_terminals (void);
334extern void mark_kboards P_ ((void)); 334extern void mark_kboards (void);
335extern void mark_ttys P_ ((void)); 335extern void mark_ttys (void);
336extern void mark_backtrace P_ ((void)); 336extern void mark_backtrace (void);
337static void gc_sweep P_ ((void)); 337static void gc_sweep (void);
338static void mark_glyph_matrix P_ ((struct glyph_matrix *)); 338static void mark_glyph_matrix (struct glyph_matrix *);
339static void mark_face_cache P_ ((struct face_cache *)); 339static void mark_face_cache (struct face_cache *);
340 340
341#ifdef HAVE_WINDOW_SYSTEM 341#ifdef HAVE_WINDOW_SYSTEM
342extern void mark_fringe_data P_ ((void)); 342extern void mark_fringe_data (void);
343#endif /* HAVE_WINDOW_SYSTEM */ 343#endif /* HAVE_WINDOW_SYSTEM */
344 344
345static struct Lisp_String *allocate_string P_ ((void)); 345static struct Lisp_String *allocate_string (void);
346static void compact_small_strings P_ ((void)); 346static void compact_small_strings (void);
347static void free_large_strings P_ ((void)); 347static void free_large_strings (void);
348static void sweep_strings P_ ((void)); 348static void sweep_strings (void);
349 349
350extern int message_enable_multibyte; 350extern int message_enable_multibyte;
351 351
@@ -369,8 +369,8 @@ enum mem_type
369 MEM_TYPE_VECTORLIKE 369 MEM_TYPE_VECTORLIKE
370}; 370};
371 371
372static POINTER_TYPE *lisp_align_malloc P_ ((size_t, enum mem_type)); 372static POINTER_TYPE *lisp_align_malloc (size_t, enum mem_type);
373static POINTER_TYPE *lisp_malloc P_ ((size_t, enum mem_type)); 373static POINTER_TYPE *lisp_malloc (size_t, enum mem_type);
374void refill_memory_reserve (); 374void refill_memory_reserve ();
375 375
376 376
@@ -452,31 +452,31 @@ static void *min_heap_address, *max_heap_address;
452static struct mem_node mem_z; 452static struct mem_node mem_z;
453#define MEM_NIL &mem_z 453#define MEM_NIL &mem_z
454 454
455static POINTER_TYPE *lisp_malloc P_ ((size_t, enum mem_type)); 455static POINTER_TYPE *lisp_malloc (size_t, enum mem_type);
456static struct Lisp_Vector *allocate_vectorlike P_ ((EMACS_INT)); 456static struct Lisp_Vector *allocate_vectorlike (EMACS_INT);
457static void lisp_free P_ ((POINTER_TYPE *)); 457static void lisp_free (POINTER_TYPE *);
458static void mark_stack P_ ((void)); 458static void mark_stack (void);
459static int live_vector_p P_ ((struct mem_node *, void *)); 459static int live_vector_p (struct mem_node *, void *);
460static int live_buffer_p P_ ((struct mem_node *, void *)); 460static int live_buffer_p (struct mem_node *, void *);
461static int live_string_p P_ ((struct mem_node *, void *)); 461static int live_string_p (struct mem_node *, void *);
462static int live_cons_p P_ ((struct mem_node *, void *)); 462static int live_cons_p (struct mem_node *, void *);
463static int live_symbol_p P_ ((struct mem_node *, void *)); 463static int live_symbol_p (struct mem_node *, void *);
464static int live_float_p P_ ((struct mem_node *, void *)); 464static int live_float_p (struct mem_node *, void *);
465static int live_misc_p P_ ((struct mem_node *, void *)); 465static int live_misc_p (struct mem_node *, void *);
466static void mark_maybe_object P_ ((Lisp_Object)); 466static void mark_maybe_object (Lisp_Object);
467static void mark_memory P_ ((void *, void *, int)); 467static void mark_memory (void *, void *, int);
468static void mem_init P_ ((void)); 468static void mem_init (void);
469static struct mem_node *mem_insert P_ ((void *, void *, enum mem_type)); 469static struct mem_node *mem_insert (void *, void *, enum mem_type);
470static void mem_insert_fixup P_ ((struct mem_node *)); 470static void mem_insert_fixup (struct mem_node *);
471static void mem_rotate_left P_ ((struct mem_node *)); 471static void mem_rotate_left (struct mem_node *);
472static void mem_rotate_right P_ ((struct mem_node *)); 472static void mem_rotate_right (struct mem_node *);
473static void mem_delete P_ ((struct mem_node *)); 473static void mem_delete (struct mem_node *);
474static void mem_delete_fixup P_ ((struct mem_node *)); 474static void mem_delete_fixup (struct mem_node *);
475static INLINE struct mem_node *mem_find P_ ((void *)); 475static INLINE struct mem_node *mem_find (void *);
476 476
477 477
478#if GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS 478#if GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS
479static void check_gcpros P_ ((void)); 479static void check_gcpros (void);
480#endif 480#endif
481 481
482#endif /* GC_MARK_STACK || GC_MALLOC_CHECK */ 482#endif /* GC_MARK_STACK || GC_MALLOC_CHECK */
@@ -495,7 +495,7 @@ static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag};
495 495
496static int staticidx = 0; 496static int staticidx = 0;
497 497
498static POINTER_TYPE *pure_alloc P_ ((size_t, int)); 498static POINTER_TYPE *pure_alloc (size_t, int);
499 499
500 500
501/* Value is SZ rounded up to the next multiple of ALIGNMENT. 501/* Value is SZ rounded up to the next multiple of ALIGNMENT.
@@ -1164,14 +1164,14 @@ allocate_buffer ()
1164 there's no need to block input around malloc. */ 1164 there's no need to block input around malloc. */
1165 1165
1166#ifndef DOUG_LEA_MALLOC 1166#ifndef DOUG_LEA_MALLOC
1167extern void * (*__malloc_hook) P_ ((size_t, const void *)); 1167extern void * (*__malloc_hook) (size_t, const void *);
1168extern void * (*__realloc_hook) P_ ((void *, size_t, const void *)); 1168extern void * (*__realloc_hook) (void *, size_t, const void *);
1169extern void (*__free_hook) P_ ((void *, const void *)); 1169extern void (*__free_hook) (void *, const void *);
1170/* Else declared in malloc.h, perhaps with an extra arg. */ 1170/* Else declared in malloc.h, perhaps with an extra arg. */
1171#endif /* DOUG_LEA_MALLOC */ 1171#endif /* DOUG_LEA_MALLOC */
1172static void * (*old_malloc_hook) P_ ((size_t, const void *)); 1172static void * (*old_malloc_hook) (size_t, const void *);
1173static void * (*old_realloc_hook) P_ ((void *, size_t, const void*)); 1173static void * (*old_realloc_hook) (void *, size_t, const void*);
1174static void (*old_free_hook) P_ ((void*, const void*)); 1174static void (*old_free_hook) (void*, const void*);
1175 1175
1176/* This function is used as the hook for free to call. */ 1176/* This function is used as the hook for free to call. */
1177 1177
@@ -1767,8 +1767,8 @@ init_strings ()
1767 1767
1768static int check_string_bytes_count; 1768static int check_string_bytes_count;
1769 1769
1770static void check_string_bytes P_ ((int)); 1770static void check_string_bytes (int);
1771static void check_sblock P_ ((struct sblock *)); 1771static void check_sblock (struct sblock *);
1772 1772
1773#define CHECK_STRING_BYTES(S) STRING_BYTES (S) 1773#define CHECK_STRING_BYTES(S) STRING_BYTES (S)
1774 1774