Make Digital Unix C compiler happy.

diff --git a/Makefile.conf b/Makefile.conf
index 1274fb41f592a86ccf0e3db69778c7bb2d7ffc4e..ee0f1952cca177d92785e8e39411c555a57ade7d 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -154,6 +154,7 @@ MINORVERSION=MinorVersion
 
 ## DEC Alpha/OSF1
 ##--alphaosf--
+#COPTS = -std
 #INSTALL=/usr/ucb/installbsd
 #MANINSTALL=/usr/ucb/installbsd
 #CF = cf/alphaosf.h

diff --git a/includes/cf/alphaosf.h b/includes/cf/alphaosf.h
index f7e72419b13e53e7cb7197ed1db23cdcf435136b..16c8fefcb2ec236d7caa2b1a9031f9d7527ea546 100644 (file)
--- a/includes/cf/alphaosf.h
+++ b/includes/cf/alphaosf.h
@@ -51,6 +51,8 @@ extern int h_errno;
 /* Varargs stuff... */
 #include <stdarg.h>
 #define VA_DOTDOTDOT ...
+#undef va_dcl
+#define va_dcl
 #define VA_start(list, last) va_start (list, last)
 
 #ifndef _PATH_DHCPD_PID

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 5009908e0f3dff62b17348017f9b5b4ac377afec..49bbf3b4c3c62f27f77b36694f8fe7597dbb5ec0 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -435,7 +435,7 @@ struct permit {
                permit_unauthenticated_clients,
                permit_all_clients,
                permit_dynamic_bootp_clients,
-               permit_class,
+               permit_class
        } type;
        struct class *class;
 };

diff --git a/includes/dhctoken.h b/includes/dhctoken.h
index b729d53568a58d97cf7edebbcdf9280a80be5f5e..414c839290dfc31f7891de605a9a4289c3eff665 100644 (file)
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -198,7 +198,7 @@ enum dhcp_token {
        INFINITE = 416,
        DELETED = 417,
        UPDATED_DNS_RR = 418,
-       DNS_DELETE = 419,
+       DNS_DELETE = 419
 };
 
 #define is_identifier(x)       ((x) >= FIRST_TOKEN &&  \

diff --git a/includes/omapip/omapip.h b/includes/omapip/omapip.h
index 038f4207618afa7337c6a2e1dfc63b453b647a4c..e498d920bf2adae5758460294edbacd3ef1b238e 100644 (file)
--- a/includes/omapip/omapip.h
+++ b/includes/omapip/omapip.h
@@ -74,7 +74,7 @@ typedef enum {
        omapi_datatype_int,
        omapi_datatype_string,
        omapi_datatype_data,
-       omapi_datatype_object,
+       omapi_datatype_object
 } omapi_datatype_t;
 
 typedef struct {
@@ -169,7 +169,7 @@ typedef enum {
        omapi_connection_connecting,
        omapi_connection_connected,
        omapi_connection_disconnecting,
-       omapi_connection_closed,
+       omapi_connection_closed
 } omapi_connection_state_t;
 
 typedef enum {
@@ -179,7 +179,7 @@ typedef enum {
        omapi_protocol_name_wait,
        omapi_protocol_name_length_wait,
        omapi_protocol_value_wait,
-       omapi_protocol_value_length_wait,
+       omapi_protocol_value_length_wait
 } omapi_protocol_state_t;
 
 typedef struct __omapi_message_object {
@@ -494,4 +494,4 @@ isc_result_t omapi_object_handle (omapi_handle_t *, omapi_object_t *);
 isc_result_t omapi_handle_lookup (omapi_object_t **, omapi_handle_t);
 isc_result_t omapi_handle_td_lookup (omapi_object_t **, omapi_typed_data_t *);
 
-#endif _OMAPIP_H_
+#endif /* _OMAPIP_H_ */

diff --git a/includes/statement.h b/includes/statement.h
index f9c1660b188790d3b46588f22cf8ea07ef2f4581..0ff7b5366722f39d058379d147b88f9a3d4902a0 100644 (file)
--- a/includes/statement.h
+++ b/includes/statement.h
@@ -34,7 +34,7 @@ struct executable_statement {
                prepend_option_statement,
                send_option_statement,
                statements_statement,
-               on_statement,
+               on_statement
        } op;
        union {
                struct {

diff --git a/includes/tree.h b/includes/tree.h
index b7fee387e1354e2908b07f9993be5cd760a6c3f5..1e225f07d76d2ff9d03e0dcf7361928e0be89ca2 100644 (file)
--- a/includes/tree.h
+++ b/includes/tree.h
@@ -93,7 +93,7 @@ enum expr_op {
        expr_dns_update,
        expr_static,
        expr_updated_dns_rr,
-       expr_dns_delete,
+       expr_dns_delete
 };
 
 struct expression {