Rename rpmcallback.* to aptcallback.* to avoid clash with rpm headers
authorPanu Matilainen <pmatilai@laiskiainen.org>
Sat, 8 Dec 2007 10:16:47 +0000 (12:16 +0200)
committerPanu Matilainen <pmatilai@laiskiainen.org>
Sat, 8 Dec 2007 10:16:47 +0000 (12:16 +0200)
of same name, same directory and all.. urgh

apt-pkg/rpm/aptcallback.cc [moved from apt-pkg/rpm/rpmcallback.cc with 99% similarity]
apt-pkg/rpm/aptcallback.h [moved from apt-pkg/rpm/rpmcallback.h with 83% similarity]

similarity index 99%
rename from apt-pkg/rpm/rpmcallback.cc
rename to apt-pkg/rpm/aptcallback.cc
index fd46132..5dd3cb1 100644 (file)
@@ -4,7 +4,7 @@
 #include <apti18n.h>
 
 #include <apt-pkg/progress.h>
-#include "rpmcallback.h"
+#include "aptcallback.h"
 
 #include <iostream>
 using namespace std;
similarity index 83%
rename from apt-pkg/rpm/rpmcallback.h
rename to apt-pkg/rpm/aptcallback.h
index e6b4b35..8919d79 100644 (file)
@@ -1,3 +1,6 @@
+#ifndef _APTRPM_RPMCALLBACK_H
+#define _APTRPM_RPMCALLBACK_H
+
 #include <apt-pkg/progress.h>
 #include <rpm/rpmcli.h>
 
@@ -17,4 +20,6 @@ void * rpmCallback(const void * arg,
                         const rpmCallbackSize_t total,
                        const void * pkgKey, void * data);
 
+#endif /* _APTRPM_RPMCALLBACK_H */
 // vim:sts=3:sw=3
+