Changeset 384 for trunk/src/sh_log_parse_pacct.c

Timestamp:

Dec 7, 2011, 9:23:01 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #282 (compile issues on FreeBSD).

File:

• trunk/src/sh_log_parse_pacct.c (modified) (2 diffs)

trunk/src/sh_log_parse_pacct.c

@@ -225 +225 @@
 }
 
-/* This looks strange, but it's real ANSI C. */
-extern struct acct pacct_rd_never_used;
-#define COMM_LEN ((int) sizeof (pacct_rd_never_used.ac_comm))
-
-sh_string * sh_read_pacct (sh_string * record, struct sh_logfile * logfile)
-{
 #if defined(__linux__) && defined(HAVE_ACCT_V3)
 #  define STRUCT_ACCT struct acct_v3
+#elif defined(__FreeBSD__) && defined(HAVE_ACCTV2)
+#  define STRUCT_ACCT struct acctv2
 #else
 #  define STRUCT_ACCT struct acct
 #endif
 
+/* This looks strange, but it's real ANSI C. */
+extern STRUCT_ACCT pacct_rd_never_used;
+#define COMM_LEN ((int) sizeof (pacct_rd_never_used.ac_comm))
+
+sh_string * sh_read_pacct (sh_string * record, struct sh_logfile * logfile)
+{
   STRUCT_ACCT rec;
 
@@ -249 +251 @@
       char   out[64+COMM_LEN+1+5+8+8+32+4+19+7]; /* see printf format below */
       
-      expand_flags(rec.ac_flag, fl);
+#if defined(ac_flagx)
+      expand_flags(rec.ac_flagx, fl);
+#else
+      expand_flags(rec.ac_flag,  fl);
+#endif
       
       /* ac_comm may not be null terminated