View | Details | Raw Unified | Return to bug 188678 | Differences between
and this patch

Collapse All | Expand All

(-)benchmarks/bonnie++/Makefile (-1 lines)
Lines 14-20 Link Here
14
LICENSE=	GPLv2
14
LICENSE=	GPLv2
15
15
16
GNU_CONFIGURE=	yes
16
GNU_CONFIGURE=	yes
17
USE_GCC=	any
18
17
19
USES=	shebangfix
18
USES=	shebangfix
20
SHEBANG_FILES=	bon_csv2txt.in
19
SHEBANG_FILES=	bon_csv2txt.in
(-)benchmarks/bonnie++/files/patch-bonnie.h.in (+20 lines)
Line 0 Link Here
1
--- bonnie.h.in.orig    2009-08-21 18:45:50.068536643 +0000
2
+++ bonnie.h.in 2009-08-21 18:45:58.564755017 +0000
3
@@ -1,8 +1,6 @@
4
 #ifndef BONNIE
5
 #define BONNIE
6
 
7
-using namespace std;
8
-
9
 #define BON_VERSION "@version@"
10
 #define CSV_VERSION "@csv_version@"
11
 
12
@@ -12,6 +10,8 @@
13
 #include <sys/stat.h>
14
 #include <fcntl.h>
15
 
16
+using namespace std;
17
+
18
 typedef FILE *PFILE;
19
 
20
 #define SemKey 4711
(-)benchmarks/bonnie++/files/patch-duration.cpp (+17 lines)
Line 0 Link Here
1
--- duration.cpp.orig   2009-08-21 18:45:50.068536643 +0000
2
+++ duration.cpp        2009-08-21 18:45:58.564755017 +0000
3
@@ -1,5 +1,3 @@
4
-using namespace std;
5
-
6
 #include <stdlib.h>
7
 
8
 #include "duration.h"
9
@@ -20,6 +18,8 @@
10
 #endif
11
 #endif
12
 
13
+using namespace std;
14
+
15
 Duration_Base::Duration_Base()
16
  : m_start(0.0)
17
  , m_max(0.0)
(-)benchmarks/bonnie++/files/patch-port.h.in (-8 / +22 lines)
Lines 1-21 Link Here
1
--- port.h.in.orig	2009-08-21 18:45:50.068536643 +0000
1
--- port.h.in.orig	2009-08-21 18:45:50.068536643 +0000
2
+++ port.h.in	2009-08-21 18:45:58.564755017 +0000
2
+++ port.h.in	2009-08-21 18:45:58.564755017 +0000
3
@@ -3,18 +3,8 @@
3
@@ -4,12 +4,12 @@
4
 
5
 #include "conf.h"
4
 #include "conf.h"
6
 
5
 
7
-#ifndef HAVE_MIN_MAX
6
 #ifndef HAVE_MIN_MAX
8
-#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO)
7
-#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO)
9
-#ifdef HAVE_ALGO
8
-#ifdef HAVE_ALGO
10
-#include <algo>
9
+#if defined(HAVE_ALGORITHM)
10
+#include <algorithm>
11
+#elif defined(HAVE_ALGO)
12
 #include <algo>
11
-#else
13
-#else
12
-#include <algo.h>
14
+#elif defined(HAVE_ALGO_H)
15
 #include <algo.h>
13
-#endif
16
-#endif
14
-#else
17
 #else
15
 #define min(XX,YY) ((XX) < (YY) ? (XX) : (YY))
18
 #define min(XX,YY) ((XX) < (YY) ? (XX) : (YY))
16
 #define max(XX,YY) ((XX) > (YY) ? (XX) : (YY))
19
 #define max(XX,YY) ((XX) > (YY) ? (XX) : (YY))
20
@@ -19,14 +19,7 @@
21
 @semun@
22
 @bool@
23
 @snprintf@
24
-#ifndef _LARGEFILE64_SOURCE
25
-@large_file@
17
-#endif
26
-#endif
27
-#ifdef _LARGEFILE64_SOURCE
28
-#define OFF_T_PRINTF "%lld"
29
-#else
30
-#define OFF_T_PRINTF "%d"
18
-#endif
31
-#endif
32
+#define OFF_T_PRINTF "%ld"
19
 
33
 
20
 @semun@
34
 #if @true_false@
21
 @bool@
35
 #define false 0
(-)benchmarks/bonnie++/files/patch-rand.h (+15 lines)
Line 0 Link Here
1
--- rand.h.orig 2009-08-21 18:45:50.068536643 +0000
2
+++ rand.h      2009-08-21 18:45:58.564755017 +0000
3
@@ -1,11 +1,11 @@
4
 #ifndef RAND_H
5
 #define RAND_H
6
 
7
-using namespace std;
8
 #include "port.h"
9
 #include <stdio.h>
10
 #include <stdlib.h>
11
 #include <string>
12
+using namespace std;
13
 
14
 class Rand
15
 {

Return to bug 188678