blob: bc364216b82ba05a09cfb549c4fc444b3b836888 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
--- digikam/digikam/digikamfirstrun.cpp.orig Wed Jan 5 10:40:08 2005
+++ digikam/digikam/digikamfirstrun.cpp Wed Jan 5 10:40:39 2005
@@ -20,15 +20,6 @@
*
* ============================================================ */
-// C Ansi includes.
-
-extern "C"
-{
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-}
-
// C++ Includes.
#include <iostream>
@@ -65,6 +56,15 @@
#include "firstrunUI.h"
#include <iostream>
+// C Ansi includes.
+
+extern "C"
+{
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+}
+
using namespace std;
DigikamFirstRun::DigikamFirstRun( KConfig* config,
--- digikam/utilities/imageeditor/imlibinterface.cpp.orig Wed Jan 5 10:45:12 2005
+++ digikam/utilities/imageeditor/imlibinterface.cpp Wed Jan 5 10:45:29 2005
@@ -22,13 +22,6 @@
#define PI 3.14159265
-// Lib Tiff includes.
-
-extern "C"
-{
-#include <tiffio.h>
-}
-
// C++ includes.
#include <cmath>
@@ -59,6 +52,13 @@
#include "albumsettings.h"
#include "imlibinterface.h"
+// Lib Tiff includes.
+
+extern "C"
+{
+#include <tiffio.h>
+}
+
namespace Digikam
{
|
