# HG changeset patch # User Dan Nicolaescu # Date 1281124367 25200 # Node ID 7b41c068528a606ce959e9daa232f83256efda1e # Parent 7525495fea9709aeb2c0f714b298f1c1eb7b1f5c 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. diff -r 7525495fea97 -r 7b41c068528a src/ChangeLog --- a/src/ChangeLog Fri Aug 06 19:48:59 2010 +0000 +++ b/src/ChangeLog Fri Aug 06 12:52:47 2010 -0700 @@ -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 -r 7525495fea97 -r 7b41c068528a src/keyboard.h --- a/src/keyboard.h Fri Aug 06 19:48:59 2010 +0000 +++ b/src/keyboard.h Fri Aug 06 12:52:47 2010 -0700 @@ -485,6 +485,8 @@ 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 -r 7525495fea97 -r 7b41c068528a src/process.h --- a/src/process.h Fri Aug 06 19:48:59 2010 +0000 +++ b/src/process.h Fri Aug 06 12:52:47 2010 -0700 @@ -166,6 +166,9 @@ 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 -r 7525495fea97 -r 7b41c068528a src/w32.c --- a/src/w32.c Fri Aug 06 19:48:59 2010 +0000 +++ b/src/w32.c Fri Aug 06 12:52:47 2010 -0700 @@ -140,10 +140,6 @@ /* 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 *);