From: Ted Lemon <source@isc.org>
Date: Wed, 6 Oct 1999 22:37:14 +0000 (+0000)
Subject: Make Digital Unix C compiler happy.
X-Git-Tag: BCTEL_SPECIAL_19991124~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c859d3b83474c53d85569ed16bebb56531c49722;p=thirdparty%2Fdhcp.git

Make Digital Unix C compiler happy.
---

diff --git a/Makefile.conf b/Makefile.conf
index 1274fb41f..ee0f1952c 100644
--- 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 f7e72419b..16c8fefcb 100644
--- 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 5009908e0..49bbf3b4c 100644
--- 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 b729d5356..414c83929 100644
--- 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 038f42076..e498d920b 100644
--- 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 f9c1660b1..0ff7b5366 100644
--- 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 b7fee387e..1e225f07d 100644
--- 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 {