X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=lib%2Flog_int.h;h=287e626eab3651f4e4c5a2313bd22e4c032c9c35;hb=9e1a7330511ed5444a76dcced5cf819e041bda2d;hp=c21d723ac6d95f8112d229158d15f7e94a36dbb5;hpb=790c77ed025f2d71d0aed1f0183bbedbbc1799e6;p=mirror_frr.git

diff --git a/lib/log_int.h b/lib/log_int.h
index c21d723ac..287e626ea 100644
--- a/lib/log_int.h
+++ b/lib/log_int.h
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef _ZEBRA_LOG_PRIVATE_H
@@ -25,21 +24,24 @@
 
 #include "log.h"
 
-struct zlog
-{
-  const char *ident;	/* daemon name (first arg to openlog) */
-  const char *protoname;
-  u_short instance;
-  int maxlvl[ZLOG_NUM_DESTS];   /* maximum priority to send to associated
-                                   logging destination */
-  int default_lvl;      /* maxlvl to use if none is specified */
-  FILE *fp;
-  char *filename;
-  int facility;         /* as per syslog facility */
-  int record_priority;  /* should messages logged through stdio include the
-                           priority of the message? */
-  int syslog_options;   /* 2nd arg to openlog */
-  int timestamp_precision;      /* # of digits of subsecond precision */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct zlog {
+	const char *ident; /* daemon name (first arg to openlog) */
+	const char *protoname;
+	unsigned short instance;
+	int maxlvl[ZLOG_NUM_DESTS]; /* maximum priority to send to associated
+				       logging destination */
+	int default_lvl;	    /* maxlvl to use if none is specified */
+	FILE *fp;
+	char *filename;
+	int facility;	/* as per syslog facility */
+	int record_priority; /* should messages logged through stdio include the
+				priority of the message? */
+	int syslog_options;  /* 2nd arg to openlog */
+	int timestamp_precision; /* # of digits of subsecond precision */
 };
 
 /* Default logging strucutre. */
@@ -48,10 +50,10 @@ extern struct zlog *zlog_default;
 extern const char *zlog_priority[];
 
 /* Generic function for zlog. */
-extern void vzlog (int priority, const char *format, va_list args);
-extern void zlog (int priority, const char *format, ...)
-  PRINTF_ATTRIBUTE(2, 3);
-
-#endif /* _ZEBRA_LOG_PRIVATE_H */
+extern void vzlog(int priority, const char *format, va_list args);
 
+#ifdef __cplusplus
+}
+#endif
 
+#endif /* _ZEBRA_LOG_PRIVATE_H */