Changeset 5984f594e3aa12bca8acea7767e2c56df3077d04

Show
Ignore:
Timestamp:
10/05/09 21:58:35 (5 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1254779915 +0000
git-parent:

[421cec729c18ee6cb786551cedc7b2e672ea6ac9]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1254779915 +0000
Message:

nothll is already on Solaris, use another name

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/modules/collectd.c

    rb9a4230 r5984f59  
    374374 */ 
    375375 
    376 unsigned long long ntohll (unsigned long long n) 
     376static unsigned long long collectd_ntohll (unsigned long long n) 
    377377{ 
    378378#if BYTE_ORDER == BIG_ENDIAN 
     
    381381  return (((unsigned long long) ntohl (n)) << 32) + ntohl (n >> 32); 
    382382#endif 
    383 } /* unsigned long long ntohll */ 
     383} /* unsigned long long collectd_ntohll */ 
    384384 
    385385#define ntohd(d) (d) 
     
    505505    { 
    506506      case DS_TYPE_COUNTER: 
    507         pkg_values[i].counter = (counter_t) ntohll (pkg_values[i].counter); 
     507        pkg_values[i].counter = (counter_t) collectd_ntohll (pkg_values[i].counter); 
    508508        break; 
    509509 
     
    513513 
    514514      case DS_TYPE_DERIVE: 
    515         pkg_values[i].derive = (derive_t) ntohll (pkg_values[i].derive); 
     515        pkg_values[i].derive = (derive_t) collectd_ntohll (pkg_values[i].derive); 
    516516        break; 
    517517 
    518518      case DS_TYPE_ABSOLUTE: 
    519         pkg_values[i].absolute = (absolute_t) ntohll (pkg_values[i].absolute); 
     519        pkg_values[i].absolute = (absolute_t) collectd_ntohll (pkg_values[i].absolute); 
    520520        break; 
    521521 
     
    573573  memcpy ((void *) &tmp64, buffer, sizeof (tmp64)); 
    574574  buffer += sizeof (tmp64); 
    575   *value = ntohll (tmp64); 
     575  *value = collectd_ntohll (tmp64); 
    576576 
    577577  *ret_buffer = buffer;