File itrace-miscellaneous-fixes_for-upstream.patch of Package itrace
---
include/itypes.h | 5 +----
src/hdump/main.c | 3 ++-
src/perfutil/perfutil.c | 1 +
src/swtrace/itracec.c | 1 +
src/swtrace/itracegtoff.c | 1 +
5 files changed, 6 insertions(+), 5 deletions(-)
--- a/include/itypes.h
+++ b/include/itypes.h
@@ -135,7 +135,7 @@
#define ITYPES_H_VERSION (1.12)
/* Platform detection, except for Linux kernel module */
-#if !defined(_LINUX) || !defined(__KERNEL__)
+#if !defined(_LINUX) && !defined(__KERNEL__)
#include <platform.h>
#endif
@@ -383,9 +383,6 @@
#endif
#endif
- #define SHORT_MAX SHRT_MAX
- #define SHORT_MIN SHRT_MIN
- #define USHORT_MAX USHRT_MAX
#define USHORT_MIN (0)
#define UINT16_MIN (0)
#define DBLBYTE_MAX USHRT_MAX
--- a/src/hdump/main.c
+++ b/src/hdump/main.c
@@ -1739,7 +1739,7 @@ void writeCommonAnc(void)
}
else
{
- printf("Object %x not found\n");
+ printf("Object %x not found\n", i);
}
}
@@ -2106,4 +2106,5 @@ int main(int argc, char ** argv)
op = 0;
op->ob = 0; // CRASH to invoke debugger
}
+ return 0;
}
--- a/src/perfutil/perfutil.c
+++ b/src/perfutil/perfutil.c
@@ -1456,6 +1456,7 @@ int ITrace_PID_Off()
rc = ITraceDisable();
rc |= ITraceOff();
+ return rc;
}
--- a/src/swtrace/itracec.c
+++ b/src/swtrace/itracec.c
@@ -95,4 +95,5 @@ main()
ITraceOff();
printf("\n pid=%d , hex=%X", getpid(), getpid());
+ return 0;
}
--- a/src/swtrace/itracegtoff.c
+++ b/src/swtrace/itracegtoff.c
@@ -30,5 +30,6 @@ main( int argc, char *argv[])
ITraceOff();
printf("\n ITrace OFF");
+ return 0;
}