Ticket #521: boinc-kfreebsd-mem.patch

client/hostinfo_unix.C

@@ -132 +132 @@
     time_data = localtime( &cur_time );
     // tm_gmtoff is already adjusted for daylight savings time
     return time_data->tm_gmtoff;
-#elif defined(linux)
+#elif defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
     return -1*(__timezone);
 #elif defined(__CYGWIN32__)
     return -1*(_timezone);
@@ -173 +173 @@
   CFRelease(list);
   return(retval);
 
-#elif defined(linux)
+#elif defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
     bool    retval = false;
 
     FILE* fapm = fopen("/proc/apm", "r");
@@ -237 +237 @@
 #endif
 }
 
-#ifdef linux
+#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
 static void parse_meminfo_linux(HOST_INFO& host) {
     char buf[256];
     double x;
@@ -449 +449 @@
     strlcpy(host.p_model, model_buf, sizeof(host.p_model));
     fclose(f);
 }
-#endif  // linux
+#endif  // __linux__ || __GNU__ || __GLIBC__
 
 #ifdef __APPLE__
 static void get_cpu_info_maxosx(HOST_INFO& host) {
@@ -520 +520 @@
     get_filesystem_info(d_total, d_free);
 
 ///////////// p_vendor, p_model, p_features /////////////////
-#ifdef linux
+#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
     parse_cpuinfo_linux(*this);
 #elif defined( __APPLE__)
     int mib[2];
@@ -604 +604 @@
         DosQuerySysInfo( QSV_TOTAVAILMEM, QSV_TOTAVAILMEM, &ulMem, sizeof(ulMem));
         m_swap = ulMem;
     }
-#elif defined(linux)
+#elif defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
     parse_meminfo_linux(*this);
 #elif defined(_SC_USEABLE_MEMORY)
     // UnixWare

client/main.C

@@ -641 +641 @@
             break;
         }
     }
-#elif defined linux
+#elif defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
     int i;
     
     for (i=1; i<argc; i++) {
@@ -734 +734 @@
             "To change ownership/permission, reinstall BOINC"
 #ifdef __APPLE__
             " or run\n the shell script Mac_SA_Secure.sh"
-#elif defined linux
+#elif defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
             " or run\n the shell script secure.sh"
 #endif
             ". (Error code %d)\n", i

configure.ac

@@ -230 +230 @@
 dnl than subtract them.  If you need to remove something from the list above,
 dnl please add it to the lists below...
 case ${target} in
-        *-linux*)       STATIC_LIB_LIST="${STATIC_LIB_LIST} nsl"
+        *-linux*|*-k*bsd*-gnu)  STATIC_LIB_LIST="${STATIC_LIB_LIST} nsl"
         ;;
         *-solaris*)     STATIC_LIB_LIST="${STATIC_LIB_LIST} X* ssl crypto"
         ;;