#1147. Correction to r4159 for linux build breaker (linux doesn't have include uuid/uuid.h)

v0.27.3
Robin Mills 10 years ago
parent 87129d61f6
commit b1b42d8e15

@ -33,11 +33,6 @@ EXIV2_RCSID("@(#) $Id$")
#include "config.h" #include "config.h"
// #1147
#ifndef _MSC_VER
#include <uuid/uuid.h>
#endif
#ifndef EXV_USE_SSH #ifndef EXV_USE_SSH
#define EXV_USE_SSH 0 #define EXV_USE_SSH 0
#endif #endif
@ -550,14 +545,13 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
// #1147 // #1147
#ifndef _MSC_VER #ifndef _MSC_VER
uuid_t* p_uid ; uid_t uid = getuid() ;
uid_t uid = getuid() ; uuid_string_t s_uid ; p_uid= (uuid_t*) &uid ; uuid_unparse(*p_uid,s_uid); uid_t euid = geteuid() ;
uid_t eid = geteuid() ; uuid_string_t s_eid ; p_uid= (uuid_t*) &eid ; uuid_unparse(*p_uid,s_eid); uid_t gid = getgid() ;
uid_t gid = getgid() ; uuid_string_t s_gid ; p_uid= (uuid_t*) &gid ; uuid_unparse(*p_uid,s_gid);
output(os,keys,"uid" , uid );
output(os,keys,"uid" , s_uid ); output(os,keys,"euid" , euid );
output(os,keys,"euid" , s_eid ); output(os,keys,"gid" , gid );
output(os,keys,"gid" , s_gid );
#endif #endif
output(os,keys,"have_regex" ,have_regex ); output(os,keys,"have_regex" ,have_regex );

Loading…
Cancel
Save