[Emacs-diffs] /srv/bzr/emacs/trunk r101957: src/w32*.c: Make functions static.

[Juanma Barranquero]

------------------------------------------------------------
revno: 101957
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2010-10-14 03:33:31 +0200
message:
  src/w32*.c: Make functions static.
  
  * src/w32fns.c (w32_wnd_proc, file_dialog_callback):
  * src/w32font.c (w32_generic_family):
  * src/w32inevt.c (key_event):
  * src/w32menu.c (fill_in_menu):
  * src/w32proc.c (reader_thread, w32_executable_type, compare_env)
    (merge_and_sort_env, int_from_hex, enum_locale_fn, enum_codepage_fn):
  * src/w32term.c (w32_read_socket): Make static.
modified:
  src/ChangeLog
  src/w32fns.c
  src/w32font.c
  src/w32inevt.c
  src/w32menu.c
  src/w32proc.c
  src/w32term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-13 23:48:09 +0000
+++ b/src/ChangeLog     2010-10-14 01:33:31 +0000
@@ -1,3 +1,13 @@
+2010-10-14  Juanma Barranquero  <address@hidden>
+
+       * w32fns.c (w32_wnd_proc, file_dialog_callback):
+       * w32font.c (w32_generic_family):
+       * w32inevt.c (key_event):
+       * w32menu.c (fill_in_menu):
+       * w32proc.c (reader_thread, w32_executable_type, compare_env)
+       (merge_and_sort_env, int_from_hex, enum_locale_fn, enum_codepage_fn):
+       * w32term.c (w32_read_socket): Make static.
+
 2010-10-13  Juanma Barranquero  <address@hidden>
 
        * image.c (DEF_IMGLIB_FN): Add argument to adapt to strict

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2010-09-24 03:35:55 +0000
+++ b/src/w32fns.c      2010-10-14 01:33:31 +0000
@@ -1900,7 +1900,7 @@
   return cursor;
 }
 
-extern LRESULT CALLBACK w32_wnd_proc (HWND, UINT, WPARAM, LPARAM);
+static LRESULT CALLBACK w32_wnd_proc (HWND, UINT, WPARAM, LPARAM);
 
 static BOOL
 w32_init_class (HINSTANCE hinst)
@@ -2672,7 +2672,7 @@
 
 /* Main window procedure */
 
-LRESULT CALLBACK
+static LRESULT CALLBACK
 w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   struct frame *f;
@@ -5903,7 +5903,7 @@
    read-only when "Directories" is selected in the filter.  This
    allows us to work around the fact that the standard Open File
    dialog does not support directories.  */
-UINT CALLBACK
+static UINT CALLBACK
 file_dialog_callback (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   if (msg == WM_NOTIFY)

=== modified file 'src/w32font.c'
--- a/src/w32font.c     2010-08-06 00:16:24 +0000
+++ b/src/w32font.c     2010-10-14 01:33:31 +0000
@@ -1058,7 +1058,7 @@
 
 
 /* Convert generic families to the family portion of lfPitchAndFamily.  */
-BYTE
+static BYTE
 w32_generic_family (Lisp_Object name)
 {
   /* Generic families.  */

=== modified file 'src/w32inevt.c'
--- a/src/w32inevt.c    2010-10-01 13:56:33 +0000
+++ b/src/w32inevt.c    2010-10-14 01:33:31 +0000
@@ -288,7 +288,7 @@
 
 /* return code -1 means that event_queue_ptr won't be incremented.
    In other word, this event makes two key codes.   (by himi)       */
-int
+static int
 key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead)
 {
   static int mod_key_state = 0;

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2010-08-19 15:53:08 +0000
+++ b/src/w32menu.c     2010-10-14 01:33:31 +0000
@@ -106,6 +106,7 @@
 #endif
 
 static void utf8to16 (unsigned char *, int, WCHAR *);
+static int fill_in_menu (HMENU, widget_value *);
 
 void w32_free_menu_strings (HWND);
 
@@ -1568,7 +1569,7 @@
 }
 
 /* Construct native Windows menu(bar) based on widget_value tree.  */
-int
+static int
 fill_in_menu (HMENU menu, widget_value *wv)
 {
   int items_added = 0;

=== modified file 'src/w32proc.c'
--- a/src/w32proc.c     2010-09-20 00:18:18 +0000
+++ b/src/w32proc.c     2010-10-14 01:33:31 +0000
@@ -159,7 +159,7 @@
 child_process child_procs[ MAX_CHILDREN ];
 child_process *dead_child = NULL;
 
-DWORD WINAPI reader_thread (void *arg);
+static DWORD WINAPI reader_thread (void *arg);
 
 /* Find an unused process slot.  */
 child_process *
@@ -279,7 +279,7 @@
    is normally blocked until woken by select() to check for input by
    reading one char.  When the read completes, char_avail is signaled
    to wake up the select emulator and the thread blocks itself again. */
-DWORD WINAPI
+static DWORD WINAPI
 reader_thread (void *arg)
 {
   child_process *cp;
@@ -608,7 +608,7 @@
 # define IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER
 #endif
 
-void
+static void
 w32_executable_type (char * filename,
                     int * is_dos_app,
                     int * is_cygnus_app,
@@ -726,7 +726,7 @@
   close_file_data (&executable);
 }
 
-int
+static int
 compare_env (const void *strp1, const void *strp2)
 {
   const char *str1 = *(const char **)strp1, *str2 = *(const char **)strp2;
@@ -750,7 +750,7 @@
     return 1;
 }
 
-void
+static void
 merge_and_sort_env (char **envp1, char **envp2, char **new_envp)
 {
   char **optr, **nptr;
@@ -1999,7 +1999,7 @@
   return make_number (GetThreadLocale ());
 }
 
-DWORD
+static DWORD
 int_from_hex (char * s)
 {
   DWORD val = 0;
@@ -2021,7 +2021,7 @@
    function isn't given a context pointer.  */
 Lisp_Object Vw32_valid_locale_ids;
 
-BOOL CALLBACK
+static BOOL CALLBACK
 enum_locale_fn (LPTSTR localeNum)
 {
   DWORD id = int_from_hex (localeNum);
@@ -2085,7 +2085,7 @@
    function isn't given a context pointer.  */
 Lisp_Object Vw32_valid_codepages;
 
-BOOL CALLBACK
+static BOOL CALLBACK
 enum_codepage_fn (LPTSTR codepageNum)
 {
   DWORD id = atoi (codepageNum);

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2010-10-01 13:56:33 +0000
+++ b/src/w32term.c     2010-10-14 01:33:31 +0000
@@ -3954,7 +3954,7 @@
    recursively with different messages by the system.
 */
 
-int
+static int
 w32_read_socket (struct terminal *terminal, int expected,
                 struct input_event *hold_quit)
 {