Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

src/tcsd/platform.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004, 2005
  *
  */
 
 
 #if (defined (__FreeBSD__) || defined (__OpenBSD__))
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <err.h>
-#elif (defined (__linux) || defined (linux))
+#elif (defined (__linux) || defined (linux) || defined(__GLIBC__))
 #include <utmp.h>
 #elif (defined (SOLARIS))
 #include <utmpx.h>
 #endif
 
 #include <sys/time.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "trousers/tss.h"
 #include "trousers_types.h"
 #include "tcs_tsp.h"
 #include "tcs_int_literals.h"
 #include "capabilities.h"
 #include "tcsps.h"
 #include "tcslog.h"
 
 
-#if (defined (__linux) || defined (linux))
+#if (defined (__linux) || defined (linux) || defined(__GLIBC__))
 MUTEX_DECLARE_INIT(utmp_lock);
 
 char
 platform_get_runlevel()
 {
         char runlevel;
         struct utmp ut, save, *next = NULL;
         struct timeval tv;
         int flag = 0, counter = 0;
 
@@ skipping 78 matching lines @@
         if (utp->ut_type == RUN_LVL &&
             sscanf(utp->ut_line, "run-level %c", &runlevel) != 1)
                         runlevel = 'u';
         endutxent();
 
         MUTEX_UNLOCK(utmp_lock);
 
         return runlevel;
 }
 #endif