Merge pull request #1 from HardySimpson/master

merge to the newest code to HardySimpson
HardySimpson · Aug 24, 2016 · b46f254 · b46f254
2 parents 8003e06 + ad6d986
commit b46f254
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/fmacros.h b/src/fmacros.h
@@ -1,7 +1,7 @@
 #ifndef __zlog_fmacro_h
 #define __zlog_fmacro_h
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #if defined(__linux__) || defined(__OpenBSD__) || defined(_AIX)
 #ifndef _XOPEN_SOURCE
@@ -14,7 +14,11 @@
 #define _XOPEN_SOURCE
 #endif
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _FILE_OFFSET_BITS
 #define _FILE_OFFSET_BITS 64
+#endif
 
 #endif
diff --git a/src/zlog.c b/src/zlog.c
@@ -1004,3 +1004,5 @@ int zlog_set_record(const char *rname, zlog_record_fn record_output)
  }
  return rc;
 }
+
+const char *zlog_version(void) { return ZLOG_VERSION; }
diff --git a/src/zlog.h b/src/zlog.h
@@ -78,6 +78,8 @@ typedef struct zlog_msg_s {
 typedef int (*zlog_record_fn)(zlog_msg_t *msg);
 int zlog_set_record(const char *rname, zlog_record_fn record);
 
+const char *zlog_version(void);
+
 /******* useful macros, can be redefined at user's h file **********/
 
 typedef enum {