Ticket #1116: 0003-Consistently-use-if-HAVE_BLAH-rather-than-mixing-if-.patch

File 0003-Consistently-use-if-HAVE_BLAH-rather-than-mixing-if-.patch, 36.6 KB (added by MattArsenault, 13 years ago)

  • api/boinc_gl.h 

    From 2d967ffbc91b292a1c7ece511f9139c36fc7df94 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <arsenm2@rpi.edu>
Date: Wed, 22 Jun 2011 18:25:43 -0400
Subject: [PATCH 3/6] Consistently use #if HAVE_BLAH rather than mixing #if
 HAVE_BLAH and

---
 api/boinc_gl.h                |   16 +++---
 api/boinc_glut.h              |   14 +++---
 api/gutil.cpp                 |   10 ++--
 client/app_control.cpp        |    6 +-
 client/app_start.cpp          |   12 +++---
 client/client_state.cpp       |    2 +-
 client/cs_account.cpp         |    2 +-
 client/cs_benchmark.cpp       |    2 +-
 client/cs_platforms.cpp       |    6 +-
 client/gui_rpc_server.cpp     |   16 +++---
 client/gui_rpc_server_ops.cpp |   12 +++---
 client/hostinfo_unix.cpp      |   32 +++++++-------
 client/http_curl.cpp          |    2 +-
 client/main.cpp               |    2 +-
 client/setprojectgrp.cpp      |    2 +-
 client/time_stats.cpp         |    2 +-
 clientscr/gfx_switcher.cpp    |    2 +-
 configure.ac                  |    4 +-
 db/boinc_db.cpp               |    2 +-
 lib/filesys.cpp               |   10 ++--
 lib/gui_rpc_client.h          |    6 +++
 lib/mac_address.cpp           |   28 ++++++------
 lib/mem_usage.cpp             |    8 ++--
 lib/msg_queue.cpp             |    2 +-
 lib/msg_queue.h               |    6 +-
 lib/network.cpp               |   10 ++--
 lib/procinfo_unix.cpp         |    8 ++--
 lib/shmem.h                   |    2 +-
 lib/str_replace.h             |    8 ++--
 lib/str_util.cpp              |   18 ++++----
 lib/unix_util.cpp             |    6 +-
 lib/unix_util.h               |   14 +++---
 lib/util.cpp                  |    4 +-
 sched/file_deleter.cpp        |    2 +-
 win_build/win-config.h        |   96 ++++++++++++++++++++--------------------
 35 files changed, 190 insertions(+), 184 deletions(-)

diff --git a/api/boinc_gl.h b/api/boinc_gl.h
index d66fbee..20997e3 100644
    a b  
    3333#else // !_WIN32, !__APPLE_CC__
    3434#include "config.h"
    3535
    36 #  if defined(HAVE_GL_H)
     36#  if HAVE_GL_H
    3737#    include <gl.h>
    38 #  elif defined(HAVE_GL_GL_H)
     38#  elif HAVE_GL_GL_H
    3939#    include <GL/gl.h>
    40 #  elif defined(HAVE_OPENGL_GL_H)
     40#  elif HAVE_OPENGL_GL_H
    4141#    include <OpenGL/gl.h>
    4242#  endif
    4343
    44 #  if defined(HAVE_GLX_H)
     44#  if HAVE_GLX_H
    4545#    include <glx.h>
    46 #  elif defined(HAVE_GL_GLX_H)
     46#  elif HAVE_GL_GLX_H
    4747#    include <GL/glx.h>
    4848#  endif
    4949
    50 #  if defined(HAVE_GLU_H)
     50#  if HAVE_GLU_H
    5151#    include <glu.h>
    52 #  elif defined(HAVE_GL_GLU_H)
     52#  elif HAVE_GL_GLU_H
    5353#    include <GL/glu.h>
    54 #  elif defined(HAVE_OPENGL_GLU_H)
     54#  elif HAVE_OPENGL_GLU_H
    5555#    include <OpenGL/glu.h>
    5656#  endif
    5757

  • api/boinc_glut.h 

    diff --git a/api/boinc_glut.h b/api/boinc_glut.h
index 3742807..31f7bb4 100644
    a b  
    1919#define H_BOINC_GLUT
    2020
    2121
    22 #if defined(_WIN32)
    23 #if defined(HAVE_GL_GLUT_H)
     22#ifdef _WIN32
     23#if HAVE_GL_GLUT_H
    2424#  include <GL/glut.h>
    25 #else 
     25#else
    2626#  include<glut.h>
    2727#endif
    2828
    … …  
    3434
    3535#include "config.h"
    3636
    37 #  if defined(HAVE_GLUT_H)
     37#  if HAVE_GLUT_H
    3838#    include "glut.h"
    39 #  elif defined(HAVE_GL_GLUT_H)
     39#  elif HAVE_GL_GLUT_H
    4040#    include <GL/glut.h>
    41 #  elif defined(HAVE_OPENGL_GLUT_H)
     41#  elif HAVE_OPENGL_GLUT_H
    4242#    include <OpenGL/glut.h>
    43 #  elif defined(HAVE_GLUT_GLUT_H)
     43#  elif HAVE_GLUT_GLUT_H
    4444#    include <GLUT/glut.h>
    4545#  endif
    4646

  • api/gutil.cpp 

    diff --git a/api/gutil.cpp b/api/gutil.cpp
index b989bf6..6ad4574 100644
    a b extern "C" { 
    4444#endif
    4545
    4646#ifndef _WIN32
    47 #if defined(HAVE_MALLOC_H) || defined(_WIN32)
     47#if HAVE_MALLOC_H || defined(_WIN32)
    4848#include <malloc.h>
    4949#if defined(__MINGW32__) && !defined(alloca)
    5050#define alloca(x) _alloca(x)
    5151#endif
    5252#endif
    53 #if defined(HAVE_ALLOCA_H)
     53#if HAVE_ALLOCA_H
    5454#include <alloca.h>
    5555#endif
    5656#ifdef __APPLE__
    … … tImageJPG *LoadJPG(const char *filename) { 
    701701        struct jpeg_decompress_struct cinfo;
    702702        tImageJPG *pImageData = NULL;
    703703        FILE *pFile;
    704 #if defined(HAVE_ALLOCA) || defined(_WIN32)
    705         alloca(16);  // Force a frame pointer even when compiled with 
     704#if HAVE_ALLOCA || defined(_WIN32)
     705        alloca(16);  // Force a frame pointer even when compiled with
    706706                 // -fomit-frame-pointer
    707707#endif
    708708
    … … int TEXTURE_DESC::CreateTextureRGB(const char* strFileName) { 
    814814        gluBuild2DMipmaps(GL_TEXTURE_2D, 3, sizeX, sizeY, GL_RGBA, GL_UNSIGNED_BYTE, pImage);
    815815        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
    816816        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR);
    817     if (pImage) 
     817    if (pImage)
    818818                free(pImage);
    819819        return 0;
    820820}

  • client/app_control.cpp 

    diff --git a/client/app_control.cpp b/client/app_control.cpp
index 23027f2..d14f010 100644
    a b  
    4343#if HAVE_SYS_RESOURCE_H
    4444#include <sys/resource.h>
    4545#endif
    46 #ifdef HAVE_CSIGNAL
     46#if HAVE_CSIGNAL
    4747#include <csignal>
    48 #elif defined(HAVE_SYS_SIGNAL_H)
     48#elif HAVE_SYS_SIGNAL_H
    4949#include <sys/signal.h>
    50 #elif defined(HAVE_SIGNAL_H)
     50#elif HAVE_SIGNAL_H
    5151#include <signal.h>
    5252#endif
    5353#if HAVE_SYS_WAIT_H

  • client/app_start.cpp 

    diff --git a/client/app_start.cpp b/client/app_start.cpp
index fcd1934..eb9ac2c 100644
    a b  
    2828#endif
    2929#else
    3030#include "config.h"
    31 #if defined (HAVE_SCHED_SETSCHEDULER) && defined (__linux__)
     31#if HAVE_SCHED_SETSCHEDULER && defined (__linux__)
    3232#include <sched.h>
    3333#endif
    3434#if HAVE_SYS_TIME_H
    … … int ACTIVE_TASK::get_shmem_seg_name() { 
    155155#else
    156156    char init_data_path[256];
    157157#ifndef __EMX__
    158     // shmem_seg_name is not used with mmap() shared memory 
     158    // shmem_seg_name is not used with mmap() shared memory
    159159    if (app_version->api_major_version() >= 6) {
    160160        shmem_seg_name = -1;
    161161        return 0;
    … … int ACTIVE_TASK::start(bool first_time) { 
    897897        freopen(STDERR_FILE, "a", stderr);
    898898
    899899        if (!config.no_priority_change) {
    900 #ifdef HAVE_SETPRIORITY
     900#if HAVE_SETPRIORITY
    901901            if (setpriority(PRIO_PROCESS, 0,
    902902                high_priority?PROCESS_MEDIUM_PRIORITY:PROCESS_IDLE_PRIORITY)
    903903            ) {
    904904                perror("setpriority");
    905905            }
    906906#endif
    907 #if defined (HAVE_SCHED_SETSCHEDULER) && defined(SCHED_BATCH) && defined (__linux__)
     907#if HAVE_SCHED_SETSCHEDULER && defined(SCHED_BATCH) && defined (__linux__)
    908908            if (!high_priority) {
    909909                struct sched_param sp;
    910910                sp.sched_priority = 0;
    … … int ACTIVE_TASK::start(bool first_time) { 
    928928                debug_print_argv(argv);
    929929            }
    930930            // Files written by projects have user boinc_project
    931             // and group boinc_project, 
    932             // so they must be world-readable so BOINC CLient can read them 
     931            // and group boinc_project,
     932            // so they must be world-readable so BOINC CLient can read them
    933933            //
    934934            umask(2);
    935935            retval = execv(switcher_path, argv);

  • client/client_state.cpp 

    diff --git a/client/client_state.cpp b/client/client_state.cpp
index e494931..4e35c47 100644
    a b  
    2626#include <ctime>
    2727#include <cstdarg>
    2828#include <cstring>
    29 #ifdef HAVE_SYS_SOCKET_H
     29#if HAVE_SYS_SOCKET_H
    3030#include <sys/socket.h>
    3131#endif
    3232#endif

  • client/cs_account.cpp 

    diff --git a/client/cs_account.cpp b/client/cs_account.cpp
index 84f80db..d90b071 100644
    a b  
    2626#include <cstdlib>
    2727#include <cstring>
    2828#include <cassert>
    29 #ifdef HAVE_SYS_STAT_H
     29#if HAVE_SYS_STAT_H
    3030#include <sys/stat.h>
    3131#endif
    3232#endif

  • client/cs_benchmark.cpp 

    diff --git a/client/cs_benchmark.cpp b/client/cs_benchmark.cpp
index 48855b4..1103112 100644
    a b void CLIENT_STATE::start_cpu_benchmarks() { 
    265265        sprintf(benchmark_descs[i].filename, "%s_%d.xml", CPU_BENCHMARKS_FILE_NAME, i);
    266266        PROCESS_ID pid = fork();
    267267        if (pid == 0) {
    268 #ifdef HAVE_SETPRIORITY
     268#if HAVE_SETPRIORITY
    269269            if (setpriority(PRIO_PROCESS, 0, PROCESS_IDLE_PRIORITY)) {
    270270                perror("setpriority");
    271271            }

  • client/cs_platforms.cpp 

    diff --git a/client/cs_platforms.cpp b/client/cs_platforms.cpp
index 7bd41b0..3b7290f 100644
    a b LPFN_ISWOW64PROCESS fnIsWow64Process; 
    2929#include <cstdio>
    3030#include <cstdlib>
    3131#include <signal.h>
    32 #ifdef HAVE_UNISTD_H
     32#if HAVE_UNISTD_H
    3333#include <unistd.h>
    3434#endif
    35 #ifdef HAVE_SYS_TYPES_H
     35#if HAVE_SYS_TYPES_H
    3636#include <sys/types.h>
    3737#endif
    38 #ifdef HAVE_SYS_WAIT_H
     38#if HAVE_SYS_WAIT_H
    3939#include <sys/wait.h>
    4040#endif
    4141#endif

  • client/gui_rpc_server.cpp 

    diff --git a/client/gui_rpc_server.cpp b/client/gui_rpc_server.cpp
index a0b9aee..e214e0e 100644
    a b  
    2525#else
    2626#include "config.h"
    2727#include <cstdio>
    28 #ifdef HAVE_UNISTD_H
     28#if HAVE_UNISTD_H
    2929#include <unistd.h>
    3030#endif
    3131#include <cerrno>
    32 #ifdef HAVE_SYS_SOCKET_H
     32#if HAVE_SYS_SOCKET_H
    3333#include <sys/socket.h>
    3434#endif
    35 #ifdef HAVE_SYS_STAT_H
     35#if HAVE_SYS_STAT_H
    3636#include <sys/stat.h>
    3737#endif
    38 #ifdef HAVE_SYS_UN_H
     38#if HAVE_SYS_UN_H
    3939#include <sys/un.h>
    4040#endif
    4141#include <vector>
    4242#include <cstring>
    43 #ifdef HAVE_NETINET_IN_H
     43#if HAVE_NETINET_IN_H
    4444#include <netinet/in.h>
    4545#endif
    46 #ifdef HAVE_NETINET_TCP_H
     46#if HAVE_NETINET_TCP_H
    4747#include <netinet/tcp.h>
    4848#endif
    49 #ifdef HAVE_ARPA_INET_H
     49#if HAVE_ARPA_INET_H
    5050#include <arpa/inet.h>
    5151#endif
    52 #ifdef HAVE_FCNTL_H
     52#if HAVE_FCNTL_H
    5353#include <fcntl.h>
    5454#endif
    5555#endif

  • client/gui_rpc_server_ops.cpp 

    diff --git a/client/gui_rpc_server_ops.cpp b/client/gui_rpc_server_ops.cpp
index 12e4fd6..a7f1ed6 100644
    a b  
    2828#else
    2929#include "config.h"
    3030#include <cstdio>
    31 #ifdef HAVE_UNISTD_H
     31#if HAVE_UNISTD_H
    3232#include <unistd.h>
    3333#endif
    34 #ifdef HAVE_SYS_SOCKET_H
     34#if HAVE_SYS_SOCKET_H
    3535#include <sys/socket.h>
    3636#endif
    37 #ifdef HAVE_SYS_UN_H
     37#if HAVE_SYS_UN_H
    3838#include <sys/un.h>
    3939#endif
    4040#include <vector>
    4141#include <cstring>
    42 #ifdef HAVE_NETINET_IN_H
     42#if HAVE_NETINET_IN_H
    4343#include <netinet/in.h>
    4444#endif
    45 #ifdef HAVE_NETINET_TCP_H
     45#if HAVE_NETINET_TCP_H
    4646#include <netinet/tcp.h>
    4747#endif
    48 #ifdef HAVE_ARPA_INET_H
     48#if HAVE_ARPA_INET_H
    4949#include <arpa/inet.h>
    5050#endif
    5151#endif

  • client/hostinfo_unix.cpp 

    diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp
index e6d6a5a..afd6f14 100644
    a b  
    6161#if HAVE_SYS_TYPES_H
    6262#include <sys/types.h>
    6363#endif
    64 #ifdef HAVE_SYS_MOUNT_H
     64#if HAVE_SYS_MOUNT_H
    6565#include <sys/mount.h>
    6666#endif
    67 #ifdef HAVE_SYS_VFS_H
     67#if HAVE_SYS_VFS_H
    6868#include <sys/vfs.h>
    6969#endif
    70 #ifdef HAVE_SYS_VMMETER_H
     70#if HAVE_SYS_VMMETER_H
    7171#include <sys/vmmeter.h>
    7272#endif
    7373
    … … char* ip_addr_string(int ip_addr) { 
    177177int get_timezone() {
    178178    tzset();
    179179    // TODO: take daylight savings time into account
    180 #ifdef HAVE_STRUCT_TM_TM_ZONE
     180#if HAVE_STRUCT_TM_TM_ZONE
    181181    time_t cur_time;
    182182    struct tm *time_data;
    183183
    … … int get_timezone() { 
    191191    return -1*(_timezone);
    192192#elif defined(unix)
    193193    return -1*timezone;
    194 #elif defined(HAVE_TZNAME)
     194#elif HAVE_TZNAME
    195195    return -1*timezone;
    196196#else
    197197#error timezone
    … … static void parse_cpuinfo_linux(HOST_INFO& host) { 
    444444                /* there might be conflicts if we dont #ifdef */
    445445#ifdef __ia64__
    446446            strstr(buf, "vendor     : ")
    447 #elif __hppa__       
     447#elif __hppa__
    448448            strstr(buf, "cpu\t\t: ")
    449449#elif __powerpc__
    450450            strstr(buf, "machine\t\t: ") || strstr(buf, "platform\t: ")
    … … int HOST_INFO::get_host_info() { 
    11721172    strlcpy( p_model, cpuInfo.name.fromID, sizeof(p_model));
    11731173#elif defined(__HAIKU__)
    11741174    get_cpu_info_haiku(*this);
    1175 #elif defined(HAVE_SYS_SYSCTL_H)
     1175#elif HAVE_SYS_SYSCTL_H
    11761176    int mib[2];
    11771177    size_t len;
    11781178
    … … int HOST_INFO::get_host_info() { 
    12101210    strncpy( p_model, "Alpha ", sizeof( p_model));
    12111211    strncat( p_model, cpu_type_name, (sizeof( p_model)- strlen( p_model)- 1));
    12121212    p_model[sizeof(p_model)-1]=0;
    1213 #elif defined(HAVE_SYS_SYSTEMINFO_H)
     1213#elif HAVE_SYS_SYSTEMINFO_H
    12141214    sysinfo(SI_PLATFORM, p_vendor, sizeof(p_vendor));
    12151215    sysinfo(SI_ISALIST, p_model, sizeof(p_model));
    12161216    for (unsigned int i=0; i<sizeof(p_model); i++) {
    … … int HOST_INFO::get_host_info() { 
    13161316#error Need to specify a method to get memory size
    13171317#endif
    13181318
    1319 #if defined(HAVE_SYS_SWAP_H) && defined(SC_GETNSWP)
     1319#if HAVE_SYS_SWAP_H && defined(SC_GETNSWP)
    13201320    // Solaris, ...
    13211321    char buf[256];
    13221322    swaptbl_t* s;
    … … int HOST_INFO::get_host_info() { 
    13321332    for (i=0; i<n; i++) {
    13331333        m_swap += 512.*(double)s->swt_ent[i].ste_length;
    13341334    }
    1335 #elif defined(HAVE_SYS_SWAP_H) && defined(SWAP_NSWAP)
     1335#elif HAVE_SYS_SWAP_H && defined(SWAP_NSWAP)
    13361336    // NetBSD (the above line should probably be more comprehensive
    13371337    struct swapent * s;
    13381338    int i, n;
    … … int HOST_INFO::get_host_info() { 
    13921392
    13931393///////////// os_name, os_version /////////////////
    13941394
    1395 #ifdef HAVE_SYS_UTSNAME_H
     1395#if HAVE_SYS_UTSNAME_H
    13961396    struct utsname u;
    13971397    uname(&u);
    13981398    safe_strcpy(os_name, u.sysname);
    13991399#if defined(__EMX__) // OS2: version is in u.version
    14001400    safe_strcpy(os_version, u.version);
    14011401#elif defined(__HAIKU__)
    1402     snprintf(os_version, sizeof(os_version), "%s, %s", u.release, u.version); 
     1402    snprintf(os_version, sizeof(os_version), "%s, %s", u.release, u.version);
    14031403#else
    14041404    safe_strcpy(os_version, u.release);
    14051405#endif
    … … int HOST_INFO::get_host_info() { 
    14071407    safe_strcpy(p_model, u.machine);
    14081408    safe_strcpy(p_vendor, "Hewlett-Packard");
    14091409#endif
    1410 #elif defined(HAVE_SYS_SYSCTL_H) && defined(CTL_KERN) && defined(KERN_OSTYPE) && defined(KERN_OSRELEASE)
     1410#elif HAVE_SYS_SYSCTL_H && defined(CTL_KERN) && defined(KERN_OSTYPE) && defined(KERN_OSRELEASE)
    14111411    mib[0] = CTL_KERN;
    14121412    mib[1] = KERN_OSTYPE;
    14131413    len = sizeof(os_name);
    … … inline bool all_tty_idle(time_t t) { 
    14981498    return true;
    14991499}
    15001500
    1501 #ifdef HAVE_UTMP_H
     1501#if HAVE_UTMP_H
    15021502inline bool user_idle(time_t t, struct utmp* u) {
    15031503    char tty[5 + sizeof u->ut_line + 1] = "/dev/";
    15041504    unsigned int i;
    … … inline bool user_idle(time_t t, struct utmp* u) { 
    15141514    return device_idle(t, tty);
    15151515}
    15161516
    1517 #if !defined(HAVE_SETUTENT) || !defined(HAVE_GETUTENT)
     1517#if !HAVE_SETUTENT || !HAVE_GETUTENT
    15181518  static FILE *ufp = NULL;
    15191519  static struct utmp ut;
    15201520
    … … bool xss_idle(long idle_treshold) { 
    17141714bool HOST_INFO::users_idle(bool check_all_logins, double idle_time_to_run) {
    17151715    time_t idle_time = time(0) - (long) (60 * idle_time_to_run);
    17161716
    1717 #ifdef HAVE_UTMP_H
     1717#if HAVE_UTMP_H
    17181718    if (check_all_logins) {
    17191719        if (!all_logins_idle(idle_time)) {
    17201720            return false;

  • client/http_curl.cpp 

    diff --git a/client/http_curl.cpp b/client/http_curl.cpp
index b7ff8c4..b1adfe8 100644
    a b  
    3131#include <sys/stat.h>
    3232#include <cerrno>
    3333#include <unistd.h>
    34 #ifdef HAVE_SYS_SOCKET_H
     34#if HAVE_SYS_SOCKET_H
    3535#include <sys/socket.h>
    3636#endif
    3737#endif

  • client/main.cpp 

    diff --git a/client/main.cpp b/client/main.cpp
index 31e35ad..eceba1c 100644
    a b  
    3131
    3232#else
    3333#include "config.h"
    34 #ifdef HAVE_SYS_SOCKET_H
     34#if HAVE_SYS_SOCKET_H
    3535#include <sys/types.h>
    3636#include <sys/socket.h>
    3737#endif

  • client/setprojectgrp.cpp 

    diff --git a/client/setprojectgrp.cpp b/client/setprojectgrp.cpp
index 6ffff84..608410d 100644
    a b  
    2727#include <grp.h>
    2828#include <cstdio>
    2929#include <cerrno>
    30 #ifdef HAVE_SYS_STAT_H
     30#if HAVE_SYS_STAT_H
    3131#include <sys/stat.h>
    3232#endif
    3333

  • client/time_stats.cpp 

    diff --git a/client/time_stats.cpp b/client/time_stats.cpp
index 203bfe3..8f4ad10 100644
    a b  
    2525#include <ctime>
    2626#include <cmath>
    2727#include <cstring>
    28 #ifdef HAVE_SYS_SOCKET_H
     28#if HAVE_SYS_SOCKET_H
    2929#include <sys/socket.h>
    3030#endif
    3131#endif

  • clientscr/gfx_switcher.cpp 

    diff --git a/clientscr/gfx_switcher.cpp b/clientscr/gfx_switcher.cpp
index 68f4474..17c09db 100644
    a b  
    2626#include <cstdio>
    2727#include <cstring>
    2828#include <cerrno>
    29 #ifdef HAVE_SYS_PARAM_H
     29#if HAVE_SYS_PARAM_H
    3030#include <sys/param.h>  // for MAXPATHLEN
    3131#endif
    3232#include <pwd.h>        // getpwuid

  • configure.ac 

    diff --git a/configure.ac b/configure.ac
index e2e87b0..114c605 100644
    a b else 
    525525   echo "DEBUG: GLUT_CFLAGS = $GLUT_CFLAGS" >&5
    526526   echo "DEBUG: GLUT_LIBS = $GLUT_LIBS" >&5
    527527
    528    AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h])
     528   AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h] gtk/gtk.h)
    529529
    530530   AC_CHECK_LIB([jpeg], [jpeg_start_compress],[have_jpeg=1],[have_jpeg=0])
    531531   AC_CHECK_HEADER([jpeglib.h],[have_jpeg=1],[have_jpeg=0])
    … … AH_TOP([ 
    564564#define BOINC_CONFIG_H
    565565
    566566/* Version defines are now in version.h */
    567 #include "version.h" 
     567#include "version.h"
    568568
    569569])
    570570AH_BOTTOM([

  • db/boinc_db.cpp 

    diff --git a/db/boinc_db.cpp b/db/boinc_db.cpp
index eb18a6b..6cefafb 100644
    a b  
    2525#include <math.h>
    2626
    2727// For machines with finite() defined in ieeefp.h
    28 #ifdef HAVE_IEEEFP_H
     28#if HAVE_IEEEFP_H
    2929#include <ieeefp.h>
    3030#endif
    3131

  • lib/filesys.cpp 

    diff --git a/lib/filesys.cpp b/lib/filesys.cpp
index 88dc86f..ee8de2b 100644
    a b  
    4747#include <unistd.h>
    4848#include <dirent.h>
    4949
    50 #ifdef HAVE_SYS_RESOURCE_H
     50#if HAVE_SYS_RESOURCE_H
    5151#include <sys/resource.h>
    5252#endif
    53 #ifdef HAVE_SYS_MOUNT_H
    54 #ifdef HAVE_SYS_PARAM_H
     53#if HAVE_SYS_MOUNT_H
     54#if HAVE_SYS_PARAM_H
    5555#include <sys/param.h>
    5656#endif
    5757#include <sys/mount.h>
    5858#endif
    5959
    60 #ifdef HAVE_SYS_STATVFS_H
     60#if HAVE_SYS_STATVFS_H
    6161#include <sys/statvfs.h>
    6262#define STATFS statvfs
    6363#elif defined(HAVE_SYS_STATFS_H)
    … … int get_filesystem_info(double &total_space, double &free_space, char* path) { 
    782782    struct STATFS fs_info;
    783783
    784784    STATFS(path, &fs_info);
    785 #ifdef HAVE_SYS_STATVFS_H
     785#if HAVE_SYS_STATVFS_H
    786786    total_space = (double)fs_info.f_frsize * (double)fs_info.f_blocks;
    787787    free_space = (double)fs_info.f_frsize * (double)fs_info.f_bavail;
    788788#else

  • lib/gui_rpc_client.h 

    diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
index 61b3a0b..5b14d37 100644
    a b  
    1717
    1818// a C++ interface to BOINC GUI RPC
    1919
     20#ifndef _GUI_RPC_CLIENT_H_
     21#define _GUI_RPC_CLIENT_H_
     22
    2023#if !defined(_WIN32) || defined (__CYGWIN__)
    2124#include <cstdio>
    2225#include <string>
    … … struct SET_LOCALE { 
    801804#endif
    802805
    803806extern int read_gui_rpc_password(char*);
     807
     808#endif /* _GUI_RPC_CLIENT_H_ */
     809

  • lib/mac_address.cpp 

    diff --git a/lib/mac_address.cpp b/lib/mac_address.cpp
index 7085bb5..1596806 100644
    a b  
    1515#else  // used to be if defined(__linux__)
    1616#include "config.h"
    1717#include <cstdio>
    18 #ifdef HAVE_UNISTD_H
     18#if HAVE_UNISTD_H
    1919#include <unistd.h>
    2020#endif
    21 #ifdef HAVE_SYS_TYPES_H
     21#if HAVE_SYS_TYPES_H
    2222#include <sys/types.h>
    2323#endif
    24 #ifdef HAVE_SYS_FCNTL_H
     24#if HAVE_SYS_FCNTL_H
    2525#include <sys/fcntl.h>
    2626#endif
    27 #ifdef HAVE_SYS_IOCTL_H
     27#if HAVE_SYS_IOCTL_H
    2828#include <sys/ioctl.h>
    2929#endif
    30 #ifdef HAVE_SYS_SOCKIO_H
     30#if HAVE_SYS_SOCKIO_H
    3131#include <sys/sockio.h>
    3232#endif
    33 #ifdef HAVE_SYS_SOCKET_H
     33#if HAVE_SYS_SOCKET_H
    3434#include <sys/socket.h>
    3535#endif
    36 #ifdef HAVE_NET_IF_H
     36#if HAVE_NET_IF_H
    3737#include <net/if.h>
    3838#endif
    39 #ifdef HAVE_NET_ARP_H
     39#if HAVE_NET_ARP_H
    4040#include <net/arp.h>
    4141#endif
    42 #ifdef HAVE_NETINET_IN_H
     42#if HAVE_NETINET_IN_H
    4343#include <netinet/in.h>
    4444#endif
    45 #ifdef HAVE_NETINET_IF_ETHER_H
     45#if HAVE_NETINET_IF_ETHER_H
    4646#include <netinet/if_ether.h>
    4747#endif
    48 #ifdef HAVE_NETINET_ETHER_H
     48#if HAVE_NETINET_ETHER_H
    4949#include <netinet/ether.h>
    5050#endif
    5151#include <string.h>
    … … get_mac_addresses(char* addresses) { 
    188188
    189189#elif defined(SIOCGIFCONF) || defined(SIOCGLIFCONF)
    190190    char          buf[1024];
    191 #ifdef HAVE_STRUCT_LIFCONF
     191#if HAVE_STRUCT_LIFCONF
    192192    struct lifconf ifc;
    193193    struct lifreq *ifr;
    194194#else
    … … get_mac_addresses(char* addresses) { 
    207207        return false;
    208208    }
    209209    /* Query available interfaces. */
    210 #ifdef HAVE_STRUCT_LIFCONF
     210#if HAVE_STRUCT_LIFCONF
    211211    ifc.lifc_len = sizeof(buf);
    212212    ifc.lifc_buf = buf;
    213213    if(ioctl(sck, SIOCGLIFCONF, &ifc) < 0)
    … … get_mac_addresses(char* addresses) { 
    225225    }
    226226#endif
    227227
    228 #ifdef HAVE_STRUCT_LIFCONF
     228#if HAVE_STRUCT_LIFCONF
    229229    /* Iterate through the list of interfaces. */
    230230    ifr         = ifc.lifc_req;
    231231    nInterfaces = ifc.lifc_len / sizeof(struct lifreq);

  • lib/mem_usage.cpp 

    diff --git a/lib/mem_usage.cpp b/lib/mem_usage.cpp
index 002cb22..471fab3 100644
    a b  
    2121#include "stdwx.h"
    2222#else
    2323#include "config.h"
    24 #ifdef HAVE_PROCFS_H
     24#if HAVE_PROCFS_H
    2525// Can't use large file calls with solaris procfs.
    2626#if defined(_FILE_OFFSET_BITS) && ( _FILE_OFFSET_BITS == 64 )
    2727#undef _FILE_OFFSET_BITS
    … …  
    3434#include <cstring>
    3535#include <cstdlib>
    3636#include <unistd.h>
    37 #ifdef HAVE_PROCFS_H
     37#if HAVE_PROCFS_H
    3838#include <procfs.h> // definitions for solaris /proc structs
    3939#endif
    4040#endif
    … … int mem_usage(double& vm_usage, double& resident_set) { 
    7474#else
    7575
    7676
    77 #if defined(HAVE_PROCFS_H) && defined(HAVE__PROC_SELF_PSINFO)
     77#if HAVE_PROCFS_H && HAVE__PROC_SELF_PSINFO
    7878    FILE* f;
    7979
    8080    // guess that this is solaris
    … … int mem_usage(double& vm_usage, double& resident_set) { 
    9595    }
    9696#endif
    9797
    98 #if defined(HAVE__PROC_SELF_STAT)
     98#if HAVE__PROC_SELF_STAT
    9999    FILE* f;
    100100    // guess that this is linux
    101101    //

  • lib/msg_queue.cpp 

    diff --git a/lib/msg_queue.cpp b/lib/msg_queue.cpp
index cef5ced..b009b21 100644
    a b  
    2121#include <cstdio>
    2222#include <cstring>
    2323#include <cstdlib>
    24 #ifdef HAVE_UNISTD_H
     24#if HAVE_UNISTD_H
    2525#include <unistd.h>
    2626#endif
    2727

  • lib/msg_queue.h 

    diff --git a/lib/msg_queue.h b/lib/msg_queue.h
index 0fde534..37d6872 100644
    a b  
    1818#ifndef _MSG_QUEUE_
    1919#define _MSG_QUEUE_
    2020
    21 #ifdef HAVE_SYS_TYPES_H
     21#if HAVE_SYS_TYPES_H
    2222#include <sys/types.h>
    2323#endif
    24 #ifdef HAVE_SYS_IPC_H
     24#if HAVE_SYS_IPC_H
    2525#include <sys/ipc.h>
    2626#endif
    27 #ifdef HAVE_SYS_MSG_H
     27#if HAVE_SYS_MSG_H
    2828#include <sys/msg.h>
    2929#endif
    3030

  • lib/network.cpp 

    diff --git a/lib/network.cpp b/lib/network.cpp
index 8740db2..2bdfd7e 100644
    a b  
    2323#include "stdwx.h"
    2424#else
    2525#include "config.h"
    26 #ifdef HAVE_UNISTD_H
     26#if HAVE_UNISTD_H
    2727#include <unistd.h>
    2828#endif
    2929#include <cstdio>
    3030#include <cstdlib>
    31 #ifdef HAVE_SYS_SOCKET_H
     31#if HAVE_SYS_SOCKET_H
    3232#include <sys/socket.h>
    3333#endif
    34 #ifdef HAVE_NETINET_IN_H
     34#if HAVE_NETINET_IN_H
    3535#include <netinet/in.h>
    3636#endif
    37 #ifdef HAVE_NETINET_TCP_H
     37#if HAVE_NETINET_TCP_H
    3838#include <netinet/tcp.h>
    3939#endif
    40 #ifdef HAVE_ARPA_INET_H
     40#if HAVE_ARPA_INET_H
    4141#include <arpa/inet.h>
    4242#endif
    4343#include <resolv.h>

  • lib/procinfo_unix.cpp 

    diff --git a/lib/procinfo_unix.cpp b/lib/procinfo_unix.cpp
index 2f91e49..f6cf317 100644
    a b  
    2020
    2121#include "config.h"
    2222
    23 #ifdef HAVE_PROCFS_H
     23#if HAVE_PROCFS_H
    2424// Can't use large file calls with solaris procfs.
    2525#if defined(_FILE_OFFSET_BITS) && ( _FILE_OFFSET_BITS == 64 )
    2626#undef _FILE_OFFSET_BITS
    … …  
    3838#include <dirent.h>
    3939#include <signal.h>
    4040
    41 #ifdef HAVE_UNISTD_H
     41#if HAVE_UNISTD_H
    4242#include <unistd.h>
    4343#endif
    4444
    45 #ifdef HAVE_PROCFS_H
     45#if HAVE_PROCFS_H
    4646#include <procfs.h>  // definitions for solaris /proc structs
    4747#endif
    4848
    … … int PROC_STAT::parse(char* buf) { 
    164164//
    165165int procinfo_setup(vector<PROCINFO>& pi) {
    166166
    167 #ifdef HAVE_DIRENT_H
     167#if HAVE_DIRENT_H
    168168    DIR *dir;
    169169    dirent *piddir;
    170170    FILE* fd;

  • lib/shmem.h 

    diff --git a/lib/shmem.h b/lib/shmem.h
index a9d3903..feb792e 100644
    a b  
    2222
    2323#ifndef _WIN32
    2424#include <sys/types.h>
    25 #ifdef HAVE_SYS_SHM_H
     25#if HAVE_SYS_SHM_H
    2626#include <sys/shm.h>
    2727#endif
    2828#endif

  • lib/str_replace.h 

    diff --git a/lib/str_replace.h b/lib/str_replace.h
index 9dff6cf..48f9767 100644
    a b  
    2424#include "config.h"
    2525#endif
    2626
    27 #if !defined(HAVE_STRLCPY)
     27#if !HAVE_STRLCPY
    2828extern size_t strlcpy(char*, const char*, size_t);
    2929#endif
    3030
    31 #if !defined(HAVE_STRLCAT)
     31#if !HAVE_STRLCAT
    3232extern size_t strlcat(char *dst, const char *src, size_t size);
    3333#endif
    3434
    35 #if !defined(HAVE_STRCASESTR)
     35#if !HAVE_STRCASESTR
    3636extern const char *strcasestr(const char *s1, const char *s2);
    3737#endif
    3838
    39 #if !defined(HAVE_STRCASECMP)
     39#if !HAVE_STRCASECMP
    4040inline int strcasecmp(const char* s1, const char* s2) {
    4141    while (*s1 && *s2) {
    4242        char c1 = tolower(*s1++);

  • lib/str_util.cpp 

    diff --git a/lib/str_util.cpp b/lib/str_util.cpp
index c3ae7c7..8e1b3a7 100644
    a b  
    3131#include <string.h>
    3232#include <stdlib.h>
    3333#include <ctype.h>
    34 #ifdef HAVE_ALLOCA_H
     34#if HAVE_ALLOCA_H
    3535#include "alloca.h"
    3636#endif
    3737#endif
    … … using std::string; 
    5252// Result will always be null-terminated, and it's faster.
    5353// see http://www.gratisoft.us/todd/papers/strlcpy.html
    5454//
    55 #if !defined(HAVE_STRLCPY)
     55#if !HAVE_STRLCPY
    5656size_t strlcpy(char *dst, const char *src, size_t size) {
    5757    size_t ret = strlen(src);
    5858
    … … size_t strlcpy(char *dst, const char *src, size_t size) { 
    6666}
    6767#endif
    6868
    69 #if !defined(HAVE_STRLCAT)
     69#if !HAVE_STRLCAT
    7070size_t strlcat(char *dst, const char *src, size_t size) {
    7171    size_t dst_len = strlen(dst);
    7272    size_t src_len = strlen(src);
    … … size_t strlcat(char *dst, const char *src, size_t size) { 
    8181}
    8282#endif // !HAVE_STRLCAT
    8383
    84 #if !defined(HAVE_STRCASESTR)
     84#if !HAVE_STRCASESTR
    8585const char *strcasestr(const char *s1, const char *s2) {
    8686    char *needle=NULL, *haystack=NULL, *p=NULL;
    8787    bool need_free = false;
    88     // Is alloca() really less likely to fail with out of memory error 
     88    // Is alloca() really less likely to fail with out of memory error
    8989    // than strdup?
    90 #if defined(HAVE_STRDUPA)
     90#if HAVE_STRDUPA
    9191    haystack=strdupa(s1);
    9292    needle=strdupa(s2);
    93 #elif defined(HAVE_ALLOCA_H) || defined(HAVE_ALLOCA)
     93#elif HAVE_ALLOCA_H || HAVE_ALLOCA
    9494    haystack=(char *)alloca(strlen(s1)+1);
    9595    needle=(char *)alloca(strlen(s2)+1);
    9696    if (needle && haystack) {
    9797        strlcpy(haystack,s1,strlen(s1)+1);
    9898        strlcpy(needle,s2,strlen(s2)+1);
    9999    }
    100 #elif defined(HAVE_STRDUP)
     100#elif HAVE_STRDUP
    101101    haystack=strdup(s1);
    102102    needle=strdup(s1)
    103103    need_free = true;
    … … const char *strcasestr(const char *s1, const char *s2) { 
    128128        if (p) {
    129129            p = const_cast<char *>(s1)+(p-haystack);
    130130        }
    131     } 
     131    }
    132132    if (need_free) {
    133133        if (needle) free(needle);
    134134        if (haystack) free(haystack);

  • lib/unix_util.cpp 

    diff --git a/lib/unix_util.cpp b/lib/unix_util.cpp
index 5a1bb7a..1d9176a 100644
    a b int setenv(const char *name, const char *value, int overwrite) { 
    8080    // this memory.  But unsetenv() is even less trivial than setenv.
    8181    return rv;
    8282}
    83 #endif /*  !HAVE_SETENV */       
     83#endif /*  !HAVE_SETENV */
    8484
    8585#ifndef HAVE_DAEMON
    8686
    8787#include <cstdio>
    8888#include <cstdlib>
    89 #ifdef HAVE_UNISTD_H
     89#if HAVE_UNISTD_H
    9090#include <unistd.h>
    9191#endif
    9292
    … … int daemon(int nochdir, int noclose) { 
    108108    if (childpid>0) {
    109109        // Fork successful.    We are the parent process.
    110110        _exit(0);
    111     } 
     111    }
    112112    if (childpid < 0) {
    113113        // Fork unsuccessful.    Return -1
    114114        return -1;

  • lib/unix_util.h 

    diff --git a/lib/unix_util.h b/lib/unix_util.h
index 6dd4263..6b853b4 100644
    a b extern "C" int daemon(int nochdir, int noclose); 
    3939// then try defining HAVE_ETHER_NTOA in your configuration file.
    4040#ifndef HAVE_ETHER_NTOA
    4141
    42 #ifdef HAVE_SYS_TYPES_H
     42#if HAVE_SYS_TYPES_H
    4343#include <sys/types.h>
    4444#endif
    45 #ifdef HAVE_SYS_SOCKET_H
     45#if HAVE_SYS_SOCKET_H
    4646#include <sys/socket.h>
    4747#endif
    48 #ifdef HAVE_NETINET_IN_H
     48#if HAVE_NETINET_IN_H
    4949#include <netinet/in.h>
    5050#endif
    51 #ifdef HAVE_ARPA_INET_H
     51#if HAVE_ARPA_INET_H
    5252#include <arpa/inet.h>
    5353#endif
    54 #ifdef HAVE_NET_IF_H
     54#if HAVE_NET_IF_H
    5555#include <net/if.h>
    5656#endif
    57 #ifdef HAVE_NETINET_IF_ETHER_H
     57#if HAVE_NETINET_IF_ETHER_H
    5858#include <netinet/if_ether.h>
    5959#endif
    60 #ifdef HAVE_NETINET_ETHER_H
     60#if HAVE_NETINET_ETHER_H
    6161#include <netinet/ether.h>
    6262#endif
    6363

  • lib/util.cpp 

    diff --git a/lib/util.cpp b/lib/util.cpp
index 5ef5bbd..dd85880 100644
    a b  
    4444#include <errno.h>
    4545#include <string>
    4646#include <cstring>
    47 #ifdef HAVE_IEEEFP_H
     47#if HAVE_IEEEFP_H
    4848#include <ieeefp.h>
    4949extern "C" {
    5050    int finite(double);
    … … int read_file_malloc(const char* path, char*& buf, size_t max_len, bool tail) { 
    329329    FILE *f = fopen(path, "rb");
    330330#else
    331331    FCGI_FILE *f = FCGI::fopen(path, "rb");
    332 #endif 
     332#endif
    333333    if (!f) return ERR_FOPEN;
    334334
    335335#ifndef _USING_FCGI_

  • sched/file_deleter.cpp 

    diff --git a/sched/file_deleter.cpp b/sched/file_deleter.cpp
index eafa0c4..c2ae1b2 100644
    a b  
    4646#include <pwd.h>
    4747#include <sys/types.h>
    4848#include <sys/stat.h>
    49 #ifdef HAVE_STRINGS_H
     49#if HAVE_STRINGS_H
    5050#include <strings.h>
    5151#endif
    5252

  • win_build/win-config.h 

    diff --git a/win_build/win-config.h b/win_build/win-config.h
index 2a2f5fb..c3f9c24 100644
    a b  
    2626#define HAVE_ATEXIT 1
    2727
    2828/* Define to 1 if you have the `atoll' function. */
    29 /* #define HAVE_ATOLL 1 */
     29#define HAVE_ATOLL 0
    3030
    3131/* Define to 1 if the system has the type `bool'. */
    3232#define HAVE_BOOL 1
    … …  
    3535#define HAVE_COSF 1
    3636
    3737/* Define to 1 if you have the <dirent.h> header file. */
    38 /* #define HAVE_DIRENT_H 1 */
     38#define HAVE_DIRENT_H 0
    3939
    4040/* Define to 1 if you have the <fcntl.h> header file. */
    4141#define HAVE_FCNTL_H 1
    … …  
    4444#define HAVE_FLOOR 1
    4545
    4646/* Define to 1 if you have the `fork' function. */
    47 //#define HAVE_FORK 1
     47#define HAVE_FORK 0
    4848
    4949/* Define to 1 if you have the `getcwd' function. */
    5050#define HAVE_GETCWD 1
    … …  
    6868#define HAVE_GL_GL_H 1
    6969
    7070/* Define to 1 if you have the <gl.h> header file. */
    71 /* #undef HAVE_GL_H */
     71#define HAVE_GL_H 0
    7272
    7373/* Define to 1 if you have the <inttypes.h> header file. */
    74 /* #undef HAVE_INTTYPES_H */
     74#define HAVE_INTTYPES_H 0
    7575
    7676/* Define to 1 if you have the `aio' library (-laio). */
    77 //#define HAVE_LIBAIO 1
     77#define HAVE_LIBAIO 0
    7878
    7979/* Define to 1 if you have the `dl' library (-ldl). */
    80 //#define HAVE_LIBDL 1
     80#define HAVE_LIBDL 0
    8181
    8282/* Define to 1 if you have the `elf' library (-lelf). */
    83 //#define HAVE_LIBELF 1
     83#define HAVE_LIBELF 0
    8484
    8585/* Define to 1 if you have the `fftw' library (-lfftw). */
    86 /* #undef HAVE_LIBFFTW */
     86#define HAVE_LIBFFTW 0
    8787
    8888/* Define to 1 if you have the `GL' library (-lGL). */
    8989#define HAVE_LIBGL 1
    9090
    9191/* Define to 1 if you have the `ICE' library (-lICE). */
    92 //#define HAVE_LIBICE 1
     92#define HAVE_LIBICE 0
    9393
    9494/* Define to 1 if you have the `m' library (-lm). */
    9595#define HAVE_LIBM 1
    9696
    9797/* Define to 1 if you have the `nsl' library (-lnsl). */
    98 //#define HAVE_LIBNSL 1
     98#define HAVE_LIBNSL 0
    9999
    100100/* Define to 1 if you have the `rsaeuro' library (-lrsaeuro). */
    101 /* #undef HAVE_LIBRSAEURO */
     101#define HAVE_LIBRSAEURO 0
    102102
    103103/* Define to 1 if you have the `s4' library (-ls4). */
    104 /* #undef HAVE_LIBS4 */
     104#define HAVE_LIBS4 0
    105105
    106106/* Define to 1 if you have the `SM' library (-lSM). */
    107 //#define HAVE_LIBSM 1
     107#define HAVE_LIBSM 0
    108108
    109109/* Define to 1 if you have the `socket' library (-lsocket). */
    110 //#define HAVE_LIBSOCKET 1
     110#define HAVE_LIBSOCKET 0
    111111
    112112/* Define to 1 if you have the `stdc++' library (-lstdc++). */
    113 //#define HAVE_LIBSTDC__ 1
     113#define HAVE_LIBSTDC__ 0
    114114
    115115/* Define to 1 if you have the `X11' library (-lX11). */
    116 //#define HAVE_LIBX11 1
     116#define HAVE_LIBX11 0
    117117
    118118/* Define to 1 if you have the `Xaw' library (-lXaw). */
    119 //#define HAVE_LIBXAW 1
     119#define HAVE_LIBXAW 0
    120120
    121121/* Define to 1 if you have the `Xext' library (-lXext). */
    122 //#define HAVE_LIBXEXT 1
     122#define HAVE_LIBXEXT 0
    123123
    124124/* Define to 1 if you have the `Xmu' library (-lXmu). */
    125 //#define HAVE_LIBXMU 1
     125#define HAVE_LIBXMU 0
    126126
    127127/* Define to 1 if you have the `Xt' library (-lXt). */
    128 /* #define HAVE_LIBXT 1 */
     128#define HAVE_LIBXT 0
    129129
    130130/* Define to 1 if you have the `z' library (-lz). */
    131 /* #define HAVE_LIBZ 1 */
     131#define HAVE_LIBZ 0
    132132
    133133/* Define to 1 if you have the <limits.h> header file. */
    134134#define HAVE_LIMITS_H 1
    … …  
    151151#define HAVE_MEMSET 1
    152152
    153153/* Define to 1 if you have the `munmap' function. */
    154 /* #define HAVE_MUNMAP 1 */
     154#define HAVE_MUNMAP 0
    155155
    156156/* Define if your C++ compiler supports namespaces */
    157157#define HAVE_NAMESPACES 1
    158158
    159159/* Define to 1 if you have the <OpenGL/glut.h> header file. */
    160 /* #undef HAVE_OPENGL_GLUT_H */
     160#define HAVE_OPENGL_GLUT_H 0
    161161
    162162/* Define to 1 if you have the <OpenGL/glu.h> header file. */
    163 /* #undef HAVE_OPENGL_GLU_H */
     163#define HAVE_OPENGL_GLU_H 0
    164164
    165165/* Define to 1 if you have the <OpenGL/gl.h> header file. */
    166 /* #undef HAVE_OPENGL_GL_H */
     166#define HAVE_OPENGL_GL_H 0
    167167
    168168/* Define to 1 if you have the `putenv' function. */
    169169#define HAVE_PUTENV 1
    … …  
    180180
    181181/* Define to 1 if `stat' has the bug that it succeeds when given the
    182182   zero-length file name argument. */
    183 /* #undef HAVE_STAT_EMPTY_STRING_BUG */
     183#define HAVE_STAT_EMPTY_STRING_BUG 0
    184184
    185185#if ( _MSC_VER > 1300 )
    186186  /* Define to 1 if the max template is in namespace std. */
    … …  
    194194#define HAVE_STD_TRANSFORM 1
    195195
    196196/* Define to 1 if stdbool.h conforms to C99. */
    197 /* #undef HAVE_STDBOOL_H */
     197#define HAVE_STDBOOL_H 0
    198198
    199199/* Define to 1 if you have the <stdint.h> header file. */
    200 /* #undef HAVE_STDINT_H */
     200#define HAVE_STDINT_H 0
    201201
    202202/* Define to 1 if you have the <stdlib.h> header file. */
    203203#define HAVE_STDLIB_H 1
    … …  
    209209#define HAVE_STRFTIME 1
    210210
    211211/* Define to 1 if you have the <strings.h> header file. */
    212 /* #define HAVE_STRINGS_H 1 */
     212#define HAVE_STRINGS_H 0
    213213
    214214/* Define to 1 if you have the <string.h> header file. */
    215215#define HAVE_STRING_H 1
    … …  
    218218#define HAVE_STRSTR 1
    219219
    220220/* Define to 1 if `st_blocks' is member of `struct stat'. */
    221 /* #define HAVE_STRUCT_STAT_ST_BLOCKS 1 */
     221#define HAVE_STRUCT_STAT_ST_BLOCKS 0
    222222
    223223/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
    224224   `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
    225 /* #define HAVE_ST_BLOCKS 1 */
     225#define HAVE_ST_BLOCKS 0
    226226
    227227/* Define to 1 if you have the <sys/ioctl.h> header file. */
    228 /* #define HAVE_SYS_IOCTL_H 1 */
     228#define HAVE_SYS_IOCTL_H 0
    229229
    230230/* Define to 1 if you have the <sys/statvfs.h> header file. */
    231 /* #define HAVE_SYS_STATVFS_H 1 */
     231#define HAVE_SYS_STATVFS_H 0
    232232
    233233/* Define to 1 if you have the <sys/stat.h> header file. */
    234234#define HAVE_SYS_STAT_H 1
    235235
    236236/* Define to 1 if you have the <sys/time.h> header file. */
    237 /* #undef HAVE_SYS_TIME_H */
     237#define HAVE_SYS_TIME_H 0
    238238
    239239/* Define to 1 if you have the <sys/types.h> header file. */
    240240#define HAVE_SYS_TYPES_H 1
    241241
    242242/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
    243 /* #define HAVE_SYS_WAIT_H 1 */
     243#define HAVE_SYS_WAIT_H 0
    244244
    245245/* Define to 1 if you have the <unistd.h> header file. */
    246 /* #define HAVE_UNISTD_H 1 */
     246#define HAVE_UNISTD_H 0
    247247
    248248/* Define to 1 if you have the `vfork' function. */
    249 /* #define HAVE_VFORK 1
     249#define HAVE_VFORK 0
    250250
    251251/* Define to 1 if you have the <vfork.h> header file. */
    252 /* #undef HAVE_VFORK_H */
     252#undef HAVE_VFORK_H 0
    253253
    254254/* Define to 1 if `fork' works. */
    255 /* #define HAVE_WORKING_FORK 1 */
     255#define HAVE_WORKING_FORK 0
    256256
    257257/* Define to 1 if `vfork' works. */
    258 /* #define HAVE_WORKING_VFORK 1 */
     258#define HAVE_WORKING_VFORK 0
    259259
    260260/* Define to 1 if the system has the type `_Bool'. */
    261 /* #undef HAVE__BOOL */
     261#undef HAVE__BOOL 0
    262262
    263263/* Define to 1 if the system has the type `_int64'. */
    264 /* #define HAVE__INT64 1 */
     264#define HAVE__INT64 0
    265265
    266266/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    267267   slash. */
    268 /* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
     268#define LSTAT_FOLLOWS_SLASHED_SYMLINK 0
    269269
    270270/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
    271271   */
    … …  
    273273
    274274/* Define to 1 if `major', `minor', and `makedev' are declared in
    275275   <sysmacros.h>. */
    276 /* #undef MAJOR_IN_SYSMACROS */
     276#define MAJOR_IN_SYSMACROS 0
    277277
    278278/* Define to the address where bug reports for this package should be sent. */
    279279#define PACKAGE_BUGREPORT "ports@setiathome.ssl.berkeley.edu"
    … …  
    300300#define STDC_HEADERS 1
    301301
    302302/* Define to 1 if your <sys/time.h> declares `struct tm'. */
    303 /* #undef TM_IN_SYS_TIME */
     303#define TM_IN_SYS_TIME 0
    304304
    305305/* Define to 1 if informix is installed */
    306 /* #undef USE_INFORMIX */
     306#define USE_INFORMIX 0
    307307
    308308/* Define if MYSQL is installed */
    309 /* #undef USE_MYSQL */
     309#define USE_MYSQL 0
    310310
    311311/* SETI@home major version number */
    312312#define VERSION_MAJOR 4