diff options
| author | Daniel Lange <DLange@git.local> | 2020-11-15 14:32:41 +0100 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2020-11-15 14:33:09 +0100 |
| commit | bb908f3dc4ac5847592e9698dec150658067e84e (patch) | |
| tree | fb0d7b03602de14f4ba6efbdd9f8a9f3cf7cc067 /solaris/Platform.h | |
| parent | da2dcf9505299eae607e29cc85691b8163c1a36e (diff) | |
| parent | e7b95feee4f375738cb339a58337fdab83f6abbf (diff) | |
Resolve merge conflicts, merge #298 "Macro cleanup" from @BenBE
Diffstat (limited to 'solaris/Platform.h')
| -rw-r--r-- | solaris/Platform.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solaris/Platform.h b/solaris/Platform.h index 5db271ce..4d83dc7e 100644 --- a/solaris/Platform.h +++ b/solaris/Platform.h @@ -32,7 +32,7 @@ typedef struct envAccum_ { size_t capacity; size_t size; size_t bytes; - char *env; + char* env; } envAccum; extern double plat_loadavg[3]; @@ -75,9 +75,9 @@ FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid); bool Platform_getDiskIO(DiskIOData* data); -bool Platform_getNetworkIO(unsigned long int *bytesReceived, - unsigned long int *packetsReceived, - unsigned long int *bytesTransmitted, - unsigned long int *packetsTransmitted); +bool Platform_getNetworkIO(unsigned long int* bytesReceived, + unsigned long int* packetsReceived, + unsigned long int* bytesTransmitted, + unsigned long int* packetsTransmitted); #endif |