[Bug 887] Fix error in ntp_types.h (for sizeof int != 4)

bk: 46c800b8chbD-XlcvtolmrGCWtat6A

diff --git a/ChangeLog b/ChangeLog
index dcc715375af77a5bf09aed55af2942199d39f098..919a22e15a0a7bbdba4328411bae93bbb048ac26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 887] Fix error in ntp_types.h (for sizeof int != 4).
 * Bug 880 bug fixes for Windows build
 * Improve Calysto support.
 * The "revoke" parameter is a crypto command.

diff --git a/dot.emacs b/dot.emacs
index 04241e7f7fd02bb42034089277bf33e99761e9d8..941ecbe8820ffd587cfc5bb0bfcae0a2f2e9baf0 100644 (file)
--- a/dot.emacs
+++ b/dot.emacs
@@ -1,13 +1,14 @@
-;; This is how Dave Mills likes to see the code formatted.
+;; This is how Dave Mills likes to see the NTP code formatted.
 
 (defconst ntp-c-style
-  '((c-basic-offset . 8)
+  '((c-basic-offset  . 8)
+    (fill-column     . 72)
     (c-offsets-alist . ((arglist-intro       . +)
                        (case-label           . *)
                        (statement-case-intro . *)
                        (statement-cont       . *)
                        (substatement-open    . 0))))
-  "Dave L. Mills; programming style for use with ntp")
+  "David L. Mills; NTP code indentation style")
 
 (defun ntp-c-mode-common-hook ()
   ;; add ntp c style

diff --git a/include/ntp_types.h b/include/ntp_types.h
index e665e713b933fc4ea422a468e071fd42d799d0a2..0f96027fe9462136961386d96d0270752b093751 100644 (file)
--- a/include/ntp_types.h
+++ b/include/ntp_types.h
@@ -44,15 +44,15 @@ typedef unsigned int u_int;
 # endif
 #else /* not sizeof(int) == 4 */
 # if (SIZEOF_LONG == 4)
-# else /* not sizeof(long) == 4 */
 #  ifndef int32
 #   define int32 long
 #  endif
 #  ifndef u_int32
 #   define u_int32 unsigned long
 #  endif
+# else /* not sizeof(long) == 4 */
+#  include "Bletch: what's 32 bits on this machine?"
 # endif /* not sizeof(long) == 4 */
-# include "Bletch: what's 32 bits on this machine?"
 #endif /* not sizeof(int) == 4 */
 
 typedef u_char         ntp_u_int8_t;