← Back to branch summary

~ubuntu-branches/ubuntu/saucy/konsole/saucy-proposed

« back to all changes in this revision

Viewing changes to src/ProcessInfo.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-12-07 18:02:30 UTC
  • mfrom: (1.1.19)
  • Revision ID: package-import@ubuntu.com-20121207180230-bcynrvir42sjg9w5
Tags: 4:4.9.90-0ubuntu1
New upstream beta release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ProcessInfo.cpp
48
48
#if defined(Q_OS_MAC)
49
49
#include <sys/sysctl.h>
50
50
#include <libproc.h>
51
 
#ifdef HAVE_SYS_PROC_INFO_H
 
51
#if defined(HAVE_SYS_PROC_INFO_H)
52
52
#include <sys/proc_info.h>
53
53
#endif
54
 
#ifdef HAVE_SYS_PROC_H
 
54
#if defined(HAVE_SYS_PROC_H)
55
55
#include <sys/proc.h>
56
56
#endif
57
57
#include <kde_file.h>
946
946
};
947
947
#endif
948
948
 
949
 
#ifdef Q_OS_SOLARIS
 
949
#if defined(Q_OS_SOLARIS)
950
950
// The procfs structure definition requires off_t to be
951
951
// 32 bits, which only applies if FILE_OFFSET_BITS=32.
952
952
// Futz around here to get it to compile regardless,
1180
1180
 
1181
1181
ProcessInfo* ProcessInfo::newInstance(int aPid, bool enableEnvironmentRead)
1182
1182
{
1183
 
#ifdef Q_OS_LINUX
 
1183
#if defined(Q_OS_LINUX)
1184
1184
    return new LinuxProcessInfo(aPid, enableEnvironmentRead);
1185
1185
#elif defined(Q_OS_SOLARIS)
1186
1186
    return new SolarisProcessInfo(aPid, enableEnvironmentRead);