Thumbnailer

Merge lp:~jpakkane/thumbnailer/raringfix into lp:thumbnailer

  1. raringfix
  2. Merge into trunk
Proposed by Jussi Pakkanen
Status: Merged
Approved by: James Henstridge
Approved revision: 63
Merged at revision: 61
Proposed branch: lp:~jpakkane/thumbnailer/raringfix
Merge into: lp:thumbnailer
Diff against target: 27 lines (+6/-0)
1 file modified
src/thumbnailcache.cpp (+6/-0)
To merge this branch: bzr merge lp:~jpakkane/thumbnailer/raringfix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
James Henstridge Approve
Review via email: mp+197775@code.launchpad.net

Commit message

Fix use of #includes.

Description of the change

Fix use of #includes.

To post a comment you must log in.
lp:~jpakkane/thumbnailer/raringfix updated
63. By Jussi Pakkanen

Moved #ifdef to the top so it is before any #includes.

Revision history for this message
James Henstridge (jamesh) wrote :

With the feature test macro moved to the top, it looks good. The #ifndef guard shouldn't be needed though.

review: Approve
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

Yeah, but this being a critical bug and all, I'm not taking any chances.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/thumbnailcache.cpp'
2--- src/thumbnailcache.cpp 2013-10-07 13:58:57 +0000
3+++ src/thumbnailcache.cpp 2013-12-04 18:11:00 +0000
4@@ -16,11 +16,16 @@
5 * Authored by: Jussi Pakkanen <jussi.pakkanen@canonical.com>
6 */
7
8+#ifndef _POSIX_SOURCE
9+#define _POSIX_SOURCE
10+#endif
11+
12 #include<thumbnailer.h>
13 #include<internal/thumbnailcache.h>
14 #include<stdexcept>
15 #include<glib.h>
16 #include<sys/stat.h>
17+#include<sys/types.h>
18 #include<cassert>
19 #include<cstdio>
20 #include<cstring>
21@@ -29,6 +34,7 @@
22 #include<unistd.h>
23 #include<vector>
24 #include<algorithm>
25+#include<dirent.h>
26
27 using namespace std;
28

Subscribers

People subscribed via source and target branches

to all changes: