From 3ef1d1082bc24df1ffcb237f6bb09cbc0395d1c8 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 6 Aug 2010 12:52:47 -0700 Subject: [PATCH] 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. --- src/ChangeLog | 7 +++++++ src/keyboard.h | 2 ++ src/process.h | 3 +++ src/w32.c | 4 ---- 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 @@ 2010-08-06 Dan Nicolaescu + * keyboard.h (quit_char): Add declaration. + * process.h (QCport, QCspeed, QCprocess, QCbytesize, QCstopbits) + (QCparity, Qodd, Qeven, QCflowcontrol, Qhw, Qsw, QCsummary): Add + declarations. + * sysdep.c: + * w32.c: Remove the above declarations. + Remove extern declarations in .c files, .h files have them. * xterm.c: * 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; X Windows wants this for selection ownership. */ extern unsigned long last_event_timestamp; +extern int quit_char; + extern int parse_menu_item (Lisp_Object, int); extern 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; extern Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; extern Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtpgid, Qcstime; extern Lisp_Object Qtime, Qctime; +extern Lisp_Object QCport, QCspeed, QCprocess; +extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven; +extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; extern Lisp_Object list_system_processes (void); extern 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 { /* For serial_configure and serial_open. */ #include "process.h" -/* From process.c */ -extern Lisp_Object QCport, QCspeed, QCprocess; -extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven; -extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; typedef HRESULT (WINAPI * ShGetFolderPath_fn) (IN HWND, IN int, IN HANDLE, IN DWORD, OUT char *); -- 2.39.2