aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2010-08-06 12:52:47 -0700
committerDan Nicolaescu2010-08-06 12:52:47 -0700
commit3ef1d1082bc24df1ffcb237f6bb09cbc0395d1c8 (patch)
tree693b1677aeba4791806f24e93d63c39a319f7695
parentbd4c5e3e069015b7ed7438155b6541cf26c44542 (diff)
downloademacs-3ef1d1082bc24df1ffcb237f6bb09cbc0395d1c8.tar.gz
emacs-3ef1d1082bc24df1ffcb237f6bb09cbc0395d1c8.zip
Move declarations to header files.
* src/keyboard.h (quit_char): Add declaration. * src/process.h (QCport, QCspeed, QCprocess, QCbytesize, QCstopbits) (QCparity, Qodd, Qeven, QCflowcontrol, Qhw, Qsw, QCsummary): Add declarations. * sysdep.c: * src/w32.c: Remove the above declarations.
-rw-r--r--src/ChangeLog7
-rw-r--r--src/keyboard.h2
-rw-r--r--src/process.h3
-rw-r--r--src/w32.c4
4 files changed, 12 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a92fc774583..d93b26b3a41 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
12010-08-06 Dan Nicolaescu <dann@ics.uci.edu> 12010-08-06 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * keyboard.h (quit_char): Add declaration.
4 * process.h (QCport, QCspeed, QCprocess, QCbytesize, QCstopbits)
5 (QCparity, Qodd, Qeven, QCflowcontrol, Qhw, Qsw, QCsummary): Add
6 declarations.
7 * sysdep.c:
8 * w32.c: Remove the above declarations.
9
3 Remove extern declarations in .c files, .h files have them. 10 Remove extern declarations in .c files, .h files have them.
4 * xterm.c: 11 * xterm.c:
5 * xdisp.c: 12 * xdisp.c:
diff --git a/src/keyboard.h b/src/keyboard.h
index 9ef558fc4e1..693137b08f4 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -485,6 +485,8 @@ extern Lisp_Object Qevent_symbol_element_mask;
485 X Windows wants this for selection ownership. */ 485 X Windows wants this for selection ownership. */
486extern unsigned long last_event_timestamp; 486extern unsigned long last_event_timestamp;
487 487
488extern int quit_char;
489
488extern int parse_menu_item (Lisp_Object, int); 490extern int parse_menu_item (Lisp_Object, int);
489 491
490extern void echo_now (void); 492extern void echo_now (void);
diff --git a/src/process.h b/src/process.h
index 12b91d697b9..6d4832ffde8 100644
--- a/src/process.h
+++ b/src/process.h
@@ -166,6 +166,9 @@ extern Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime;
166extern Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; 166extern Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs;
167extern Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtpgid, Qcstime; 167extern Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtpgid, Qcstime;
168extern Lisp_Object Qtime, Qctime; 168extern Lisp_Object Qtime, Qctime;
169extern Lisp_Object QCport, QCspeed, QCprocess;
170extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven;
171extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary;
169 172
170extern Lisp_Object list_system_processes (void); 173extern Lisp_Object list_system_processes (void);
171extern Lisp_Object system_process_attributes (Lisp_Object); 174extern Lisp_Object system_process_attributes (Lisp_Object);
diff --git a/src/w32.c b/src/w32.c
index 19335742347..f1ed6ae0be9 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -140,10 +140,6 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX {
140 140
141/* For serial_configure and serial_open. */ 141/* For serial_configure and serial_open. */
142#include "process.h" 142#include "process.h"
143/* From process.c */
144extern Lisp_Object QCport, QCspeed, QCprocess;
145extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven;
146extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary;
147 143
148typedef HRESULT (WINAPI * ShGetFolderPath_fn) 144typedef HRESULT (WINAPI * ShGetFolderPath_fn)
149 (IN HWND, IN int, IN HANDLE, IN DWORD, OUT char *); 145 (IN HWND, IN int, IN HANDLE, IN DWORD, OUT char *);