aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorJuanma Barranquero2010-07-20 22:21:03 +0200
committerJuanma Barranquero2010-07-20 22:21:03 +0200
commit7c3320d8b9d3beaf952b20cfe1843181c1c7af65 (patch)
tree188ab3f0c3582c2890365bd92939e32a6b01d44c /src/alloc.c
parentaf4b9ae58662d50080a7661631ce6861dc6b6aa9 (diff)
downloademacs-7c3320d8b9d3beaf952b20cfe1843181c1c7af65.tar.gz
emacs-7c3320d8b9d3beaf952b20cfe1843181c1c7af65.zip
Convert some more functions to standard C.
* lib-src/emacsclient.c (get_current_dir_name, w32_get_resource) (w32_getenv, w32_set_user_model_id, w32_window_app, w32_execvp) (close_winsock, initialize_sockets, w32_find_emacs_process) (w32_give_focus): * lib-src/ntlib.c (getlogin, getuid, getgid, getegid): * nt/addpm.c (add_registry, main): * nt/cmdproxy.c (get_env_size): * nt/ddeclient.c (main): * nt/runemacs.c (set_user_model_id): * src/alloc.c (emacs_blocked_free, emacs_blocked_malloc) (emacs_blocked_realloc, uninterrupt_malloc): * src/fringe.c (w32_reset_fringes): * src/image.c (convert_mono_to_color_image, lookup_rgb_color) (init_color_table, XPutPixel, jpeg_resync_to_restart_wrapper): * src/sound.c (be2hs, do_play_sound): * src/vm-limit.c (get_lim_data, ret_lim_data): * src/w32term.c (x_free_frame_resources): * src/xfaces.c (x_create_gc, x_free_gc): Convert definitions to standard C.
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 5c860bc1f8e..2ce74f97ff7 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1161,9 +1161,7 @@ static void (*old_free_hook) (void*, const void*);
1161/* This function is used as the hook for free to call. */ 1161/* This function is used as the hook for free to call. */
1162 1162
1163static void 1163static void
1164emacs_blocked_free (ptr, ptr2) 1164emacs_blocked_free (void *ptr, const void *ptr2)
1165 void *ptr;
1166 const void *ptr2;
1167{ 1165{
1168 BLOCK_INPUT_ALLOC; 1166 BLOCK_INPUT_ALLOC;
1169 1167
@@ -1211,9 +1209,7 @@ emacs_blocked_free (ptr, ptr2)
1211/* This function is the malloc hook that Emacs uses. */ 1209/* This function is the malloc hook that Emacs uses. */
1212 1210
1213static void * 1211static void *
1214emacs_blocked_malloc (size, ptr) 1212emacs_blocked_malloc (size_t size, const void *ptr)
1215 size_t size;
1216 const void *ptr;
1217{ 1213{
1218 void *value; 1214 void *value;
1219 1215
@@ -1260,10 +1256,7 @@ emacs_blocked_malloc (size, ptr)
1260/* This function is the realloc hook that Emacs uses. */ 1256/* This function is the realloc hook that Emacs uses. */
1261 1257
1262static void * 1258static void *
1263emacs_blocked_realloc (ptr, size, ptr2) 1259emacs_blocked_realloc (void *ptr, size_t size, const void *ptr2)
1264 void *ptr;
1265 size_t size;
1266 const void *ptr2;
1267{ 1260{
1268 void *value; 1261 void *value;
1269 1262
@@ -1337,7 +1330,7 @@ reset_malloc_hooks ()
1337/* Called from main to set up malloc to use our hooks. */ 1330/* Called from main to set up malloc to use our hooks. */
1338 1331
1339void 1332void
1340uninterrupt_malloc () 1333uninterrupt_malloc (void)
1341{ 1334{
1342#ifdef HAVE_GTK_AND_PTHREAD 1335#ifdef HAVE_GTK_AND_PTHREAD
1343#ifdef DOUG_LEA_MALLOC 1336#ifdef DOUG_LEA_MALLOC