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 /linux/Platform.h | |
| parent | da2dcf9505299eae607e29cc85691b8163c1a36e (diff) | |
| parent | e7b95feee4f375738cb339a58337fdab83f6abbf (diff) | |
Resolve merge conflicts, merge #298 "Macro cleanup" from @BenBE
Diffstat (limited to 'linux/Platform.h')
| -rw-r--r-- | linux/Platform.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/Platform.h b/linux/Platform.h index 5a661a04..fc249095 100644 --- a/linux/Platform.h +++ b/linux/Platform.h @@ -57,9 +57,9 @@ void Platform_getPressureStall(const char *file, bool some, double* ten, double* 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 |