aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-10-16 10:36:04 -0700
committerPaul Eggert2013-10-16 10:36:04 -0700
commit0a2b8e3c26d7b8cf351b9ba337e32d18d4f63202 (patch)
treee3332a72b7d687f8f497a5f004a73373362ec778 /src
parent2318fccaa605347e1d7fc50c13334f6c18c1c6ce (diff)
downloademacs-0a2b8e3c26d7b8cf351b9ba337e32d18d4f63202.tar.gz
emacs-0a2b8e3c26d7b8cf351b9ba337e32d18d4f63202.zip
* process.h (conv_sockaddr_to_lisp): New decl, for newly-extern func.
(struct sockaddr): Add forward decl, for platforms that lack it.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/process.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9c6ce8321bc..b0774188c10 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-10-16 Paul Eggert <eggert@cs.ucla.edu>
2
3 * process.h (conv_sockaddr_to_lisp): New decl, for newly-extern func.
4 (struct sockaddr): Add forward decl, for platforms that lack it.
5
12013-10-16 Jan Djärv <jan.h.d@swipnet.se> 62013-10-16 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return 8 * nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return
diff --git a/src/process.h b/src/process.h
index 163066f025f..fc69e2761a5 100644
--- a/src/process.h
+++ b/src/process.h
@@ -226,6 +226,8 @@ extern Lisp_Object system_process_attributes (Lisp_Object);
226/* Defined in process.c. */ 226/* Defined in process.c. */
227 227
228extern void record_deleted_pid (pid_t, Lisp_Object); 228extern void record_deleted_pid (pid_t, Lisp_Object);
229struct sockaddr;
230extern Lisp_Object conv_sockaddr_to_lisp (struct sockaddr *, int);
229extern void hold_keyboard_input (void); 231extern void hold_keyboard_input (void);
230extern void unhold_keyboard_input (void); 232extern void unhold_keyboard_input (void);
231extern bool kbd_on_hold_p (void); 233extern bool kbd_on_hold_p (void);