X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=blobdiff_plain;f=src%2Finclude%2Flibradius.h;h=5423583b6ecdbd69866e1cde0101d19e99f0fe31;hp=bbf5e79e01f240da683c14810be76145afaa7a08;hb=e2eaf9194b16fdd15ebf274aafd05edc9fefb4bb;hpb=e4bd07a28ea12db9a4633df981ace7bafd3a5445

diff --git a/src/include/libradius.h b/src/include/libradius.h
index bbf5e79..5423583 100644
--- a/src/include/libradius.h
+++ b/src/include/libradius.h
@@ -57,6 +57,10 @@ RCSIDH(libradius_h, "$Id$")
 #define WITH_TCP (1)
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define EAP_START               2
 
 #define AUTH_VECTOR_LEN		16
@@ -164,7 +168,16 @@ typedef struct value_pair {
 	unsigned int	       	vendor;
 	int			type;
 	size_t			length; /* of data */
+#ifdef __cplusplus
+	/*
+	 *	C++ hackery.  The server and modules are all C, so
+	 *	the defs here don't affect them.  But any C++ code
+	 *	gets excited over "operator", so we change the name.
+	 */
+	FR_TOKEN		op_token;
+#else
 	FR_TOKEN		operator;
+#endif
         ATTR_FLAGS              flags;
 	struct value_pair	*next;
 	uint32_t		lvalue;
@@ -483,6 +496,10 @@ void *fr_fifo_pop(fr_fifo_t *fi);
 void *fr_fifo_peek(fr_fifo_t *fi);
 int fr_fifo_num_elements(fr_fifo_t *fi);
 
+#ifdef __cplusplus
+}
+#endif
+
 #include <freeradius-devel/packet.h>
 
 #ifdef WITH_TCP