diff --git a/ChangeLog b/ChangeLog
index 26271654af..6bf7edb5f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-05-12  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* resolv/arpa/nameser.h: Add C++ protectors.
+
 1999-05-08  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* iconvdata/gconv-modules: Fix alias for CP1255.  Reported by
diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h
index e9bf744ea4..122168c270 100644
--- a/resolv/arpa/nameser.h
+++ b/resolv/arpa/nameser.h
@@ -249,6 +249,8 @@
 /* glibc always has byte order info in <endian.h> */
 #include <endian.h>
 
+__BEGIN_DECLS
+
 /*
  * Structure for query header.  The order of the fields is machine- and
  * compiler-dependent, depending on the byte/bit order and the layout
@@ -343,4 +345,6 @@ extern	u_int32_t	_getlong __P((const u_char *));
 	(cp) += INT32SZ; \
 }
 
+__END_DECLS
+
 #endif /* arpa/nameser.h */