[Emacs-diffs] trunk r117598: Fix --without-x build and pacify --enable-gcc-warnings.

[Dmitry Antipov]

------------------------------------------------------------
revno: 117598
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2014-07-28 12:07:55 +0400
message:
  Fix --without-x build and pacify --enable-gcc-warnings.
  Problems reported in Bug#18122 and Bug#18124.
  * frame.c (get_frame_param): Define even if !HAVE_WINDOW_SYSTEM.
  (frame_windows_min_size): Now static.
  * frame.h (FRAME_HAS_HORIZONTAL_SCROLL_BARS) [!HAVE_WINDOW_SYSTEM]:
  Define as no-op.
  (adjust_frame_size): Always declare prototype.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/frame.h                    frame.h-20091113204419-o5vbwnq5f7feedwu-229

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-28 07:17:22 +0000
+++ b/src/ChangeLog     2014-07-28 08:07:55 +0000
@@ -23,6 +23,14 @@
        * lisp.h (add_timer_wait_descriptor) [HAVE_TIMERFD]: Likewise.
        * process.c (add_timer_wait_descriptor) [HAVE_TIMERFD]: New function.
 
+       Fix --without-x build and pacify --enable-gcc-warnings.
+       Problems reported in Bug#18122 and Bug#18124.
+       * frame.c (get_frame_param): Define even if !HAVE_WINDOW_SYSTEM.
+       (frame_windows_min_size): Now static.
+       * frame.h (FRAME_HAS_HORIZONTAL_SCROLL_BARS) [!HAVE_WINDOW_SYSTEM]:
+       Define as no-op.
+       (adjust_frame_size): Always declare prototype.
+
 2014-07-28  Paul Eggert  <address@hidden>
 
        * frame.c (x_set_frame_parameters): Don't use uninitialized locals.

=== modified file 'src/frame.c'
--- a/src/frame.c       2014-07-28 02:13:11 +0000
+++ b/src/frame.c       2014-07-28 08:07:55 +0000
@@ -194,9 +194,8 @@
           : "Window system is not in use or not initialized");
 }
 
-
 /* Return the value of frame parameter PROP in frame FRAME.  */
-#ifdef HAVE_WINDOW_SYSTEM
+
 Lisp_Object
 get_frame_param (register struct frame *frame, Lisp_Object prop)
 {
@@ -207,8 +206,6 @@
     return tem;
   return Fcdr (tem);
 }
-#endif
-
 
 /* Return 1 if `frame-inhibit-implied-resize' is non-nil or fullscreen
    state of frame F would be affected by a vertical (horizontal if
@@ -367,7 +364,7 @@
     return type;
 }
 
-int
+static int
 frame_windows_min_size (Lisp_Object frame, Lisp_Object horizontal, Lisp_Object 
pixelwise)
 {
   return XINT (call3 (Qframe_windows_min_size, frame, horizontal, pixelwise));

=== modified file 'src/frame.h'
--- a/src/frame.h       2014-07-27 13:21:30 +0000
+++ b/src/frame.h       2014-07-28 08:07:55 +0000
@@ -866,6 +866,7 @@
 #define FRAME_HAS_VERTICAL_SCROLL_BARS(f) ((void) f, 0)
 #define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT(f) ((void) f, 0)
 #define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT(f) ((void) f, 0)
+#define FRAME_HAS_HORIZONTAL_SCROLL_BARS(f) ((void) f, 0)
 
 #endif /* HAVE_WINDOW_SYSTEM */
 
@@ -1108,6 +1109,7 @@
 extern void frame_make_pointer_visible (struct frame *);
 extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object);
 extern bool frame_inhibit_resize (struct frame *, bool); 
+extern void adjust_frame_size (struct frame *, int, int, int, bool);
 
 extern Lisp_Object Vframe_list;
 
@@ -1376,10 +1378,6 @@
 /* The class of this X application.  */
 #define EMACS_CLASS "Emacs"
 
-/* If these are not in frame.c they are in xterm.c, w32term.c, etc.  */
-extern void adjust_frame_size (struct frame *, int, int, int, bool);
-extern int frame_windows_min_size (Lisp_Object, Lisp_Object, Lisp_Object);
-
 extern void x_set_scroll_bar_default_width (struct frame *);
 extern void x_set_scroll_bar_default_height (struct frame *);
 extern void x_set_offset (struct frame *, int, int, int);