mirror of
https://github.com/xzeldon/htop.git
synced 2024-12-23 22:55:46 +00:00
Rename String to StringUtils.
Fixes building on case-insensitive filesystems where String.h gets confused with <string.h>. From d734dacea0a10d0465dad4e95b3421511e7da112 Mon Sep 17 00:00:00 2001 From: David Hunt <dhunt@iolanthe.attlocal.net> Date: Sat, 11 Jul 2015 20:56:31 -0500 Subject: [PATCH 1/8] Rename String to StringUtils
This commit is contained in:
David Hunt
Hisham Muhammad
parent
f2c053a884
commit
5e602f18d5
2
Action.c
2
Action.c
@ -17,7 +17,7 @@ in the source distribution for its full text.
|
||||
#include "Process.h"
|
||||
#include "ScreenManager.h"
|
||||
#include "SignalsPanel.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "TraceScreen.h"
|
||||
#include "Platform.h"
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
|
||||
#include "Battery.h"
|
||||
#include "ProcessList.h"
|
||||
#include "CRT.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "Platform.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
2
CRT.c
2
CRT.c
@ -7,7 +7,7 @@ in the source distribution for its full text.
|
||||
|
||||
#include "CRT.h"
|
||||
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "RichString.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
@ -8,7 +8,7 @@ in the source distribution for its full text.
|
||||
#include "ColumnsPanel.h"
|
||||
#include "Platform.h"
|
||||
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "ListItem.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
2
Header.c
2
Header.c
@ -8,7 +8,7 @@ in the source distribution for its full text.
|
||||
#include "Header.h"
|
||||
|
||||
#include "CRT.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "Platform.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
2
IncSet.c
2
IncSet.c
@ -6,7 +6,7 @@ in the source distribution for its full text.
|
||||
*/
|
||||
|
||||
#include "IncSet.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "Panel.h"
|
||||
#include "ListItem.h"
|
||||
#include "CRT.h"
|
||||
|
||||
@ -8,7 +8,7 @@ in the source distribution for its full text.
|
||||
#include "ListItem.h"
|
||||
|
||||
#include "CRT.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "RichString.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
12
Makefile.am
12
Makefile.am
@ -12,7 +12,7 @@ applications_DATA = htop.desktop
|
||||
pixmapdir = $(datadir)/pixmaps
|
||||
pixmap_DATA = htop.png
|
||||
|
||||
htop_CFLAGS = -pedantic -Wall $(wextra_flag) -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(my_htop_platform)"
|
||||
htop_CFLAGS = -pedantic -Wall $(wextra_flag) -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(top_srcdir)/$(my_htop_platform)"
|
||||
AM_CPPFLAGS = -DNDEBUG
|
||||
|
||||
myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
|
||||
@ -20,8 +20,8 @@ ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c MainPanel.c \
|
||||
DisplayOptionsPanel.c FunctionBar.c Hashtable.c Header.c htop.c ListItem.c \
|
||||
LoadAverageMeter.c MemoryMeter.c Meter.c MetersPanel.c Object.c Panel.c \
|
||||
BatteryMeter.c Process.c ProcessList.c RichString.c ScreenManager.c Settings.c \
|
||||
SignalsPanel.c String.c SwapMeter.c TasksMeter.c UptimeMeter.c TraceScreen.c \
|
||||
UsersTable.c Vector.c AvailableColumnsPanel.c AffinityPanel.c \
|
||||
SignalsPanel.c StringUtils.c SwapMeter.c TasksMeter.c UptimeMeter.c \
|
||||
TraceScreen.c UsersTable.c Vector.c AvailableColumnsPanel.c AffinityPanel.c \
|
||||
HostnameMeter.c OpenFilesScreen.c Affinity.c IncSet.c Action.c
|
||||
|
||||
myhtopheaders = AvailableColumnsPanel.h AvailableMetersPanel.h \
|
||||
@ -29,9 +29,9 @@ CategoriesPanel.h CheckItem.h ClockMeter.h ColorsPanel.h ColumnsPanel.h \
|
||||
CPUMeter.h CRT.h MainPanel.h DisplayOptionsPanel.h FunctionBar.h \
|
||||
Hashtable.h Header.h htop.h ListItem.h LoadAverageMeter.h MemoryMeter.h \
|
||||
BatteryMeter.h Meter.h MetersPanel.h Object.h Panel.h ProcessList.h RichString.h \
|
||||
ScreenManager.h Settings.h SignalsPanel.h String.h SwapMeter.h TasksMeter.h \
|
||||
UptimeMeter.h TraceScreen.h UsersTable.h Vector.h Process.h AffinityPanel.h \
|
||||
HostnameMeter.h OpenFilesScreen.h Affinity.h IncSet.h Action.h
|
||||
ScreenManager.h Settings.h SignalsPanel.h StringUtils.h SwapMeter.h \
|
||||
TasksMeter.h UptimeMeter.h TraceScreen.h UsersTable.h Vector.h Process.h \
|
||||
AffinityPanel.h HostnameMeter.h OpenFilesScreen.h Affinity.h IncSet.h Action.h
|
||||
|
||||
if HTOP_LINUX
|
||||
htop_CFLAGS += -rdynamic
|
||||
|
||||
2
Meter.c
2
Meter.c
@ -10,7 +10,7 @@ in the source distribution for its full text.
|
||||
#include "RichString.h"
|
||||
#include "Object.h"
|
||||
#include "CRT.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "ListItem.h"
|
||||
#include "Settings.h"
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ in the source distribution for its full text.
|
||||
#include "ProcessList.h"
|
||||
#include "ListItem.h"
|
||||
#include "IncSet.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "FunctionBar.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
2
Panel.c
2
Panel.c
@ -10,7 +10,7 @@ in the source distribution for its full text.
|
||||
#include "CRT.h"
|
||||
#include "RichString.h"
|
||||
#include "ListItem.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
#include <math.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
@ -9,7 +9,7 @@ in the source distribution for its full text.
|
||||
#include "Settings.h"
|
||||
|
||||
#include "CRT.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "RichString.h"
|
||||
#include "Platform.h"
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ in the source distribution for its full text.
|
||||
#include "Platform.h"
|
||||
|
||||
#include "CRT.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
@ -8,7 +8,7 @@ in the source distribution for its full text.
|
||||
#include "Settings.h"
|
||||
#include "Platform.h"
|
||||
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "Vector.h"
|
||||
#include "CRT.h"
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@ Released under the GNU GPL, see the COPYING file
|
||||
in the source distribution for its full text.
|
||||
*/
|
||||
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
#include "config.h"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Do not edit this file. It was automatically generated. */
|
||||
|
||||
#ifndef HEADER_String
|
||||
#define HEADER_String
|
||||
#ifndef HEADER_StringUtils
|
||||
#define HEADER_StringUtils
|
||||
/*
|
||||
htop - String.h
|
||||
(C) 2004-2011 Hisham H. Muhammad
|
||||
@ -11,7 +11,7 @@ in the source distribution for its full text.
|
||||
#include "ProcessList.h"
|
||||
#include "ListItem.h"
|
||||
#include "IncSet.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include "FunctionBar.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
@ -18,7 +18,7 @@ Linux battery readings written by Ian P. Hands (iphands@gmail.com, ihands@redhat
|
||||
#include <fcntl.h>
|
||||
#include <time.h>
|
||||
#include "BatteryMeter.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
#define SYS_POWERSUPPLY_DIR "/sys/class/power_supply"
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ in the source distribution for its full text.
|
||||
#include "LinuxProcessList.h"
|
||||
#include "LinuxProcess.h"
|
||||
#include "CRT.h"
|
||||
#include "String.h"
|
||||
#include "StringUtils.h"
|
||||
#include <errno.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/utsname.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user