cleanup headers and especially #includes everywhere

[apt.git] / apt-pkg / contrib / gpgv.h

diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h
index d9712d6a86331ca003cd8ce56840811585819b5a..ab3c68de5a0707f93cc8cbec74184fd407028b1a 100644 (file)
--- a/apt-pkg/contrib/gpgv.h
+++ b/apt-pkg/contrib/gpgv.h
@@ -9,17 +9,17 @@
 #ifndef CONTRIB_GPGV_H
 #define CONTRIB_GPGV_H
 
 #ifndef CONTRIB_GPGV_H
 #define CONTRIB_GPGV_H
 

+#include <apt-pkg/macros.h>
+

 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

+#ifndef APT_10_CLEANER_HEADERS

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/fileutl.h>

-
-#if __GNUC__ >= 4
-       #define APT_noreturn    __attribute__ ((noreturn))
-#else
-       #define APT_noreturn    /* no support */

 #endif
 
 #endif
 

+class FileFd;
+

 /** \brief generates and run the command to verify a file with gpgv
  *
  * If File and FileSig specify the same file it is assumed that we
 /** \brief generates and run the command to verify a file with gpgv
  *
  * If File and FileSig specify the same file it is assumed that we


@@ -40,15 +40,13 @@
  * @param FileSig is the signature (detached or clear-signed)
  */
 void ExecGPGV(std::string const &File, std::string const &FileSig,
  * @param FileSig is the signature (detached or clear-signed)
  */
 void ExecGPGV(std::string const &File, std::string const &FileSig,

-      int const &statusfd, int fd[2]) APT_noreturn;
+      int const &statusfd, int fd[2]) APT_NORETURN;

 inline void ExecGPGV(std::string const &File, std::string const &FileSig,
       int const &statusfd = -1) {
    int fd[2];
    ExecGPGV(File, FileSig, statusfd, fd);
 }
 
 inline void ExecGPGV(std::string const &File, std::string const &FileSig,
       int const &statusfd = -1) {
    int fd[2];
    ExecGPGV(File, FileSig, statusfd, fd);
 }
 

-#undef APT_noreturn
-

 /** \brief Split an inline signature into message and signature
  *
  *  Takes a clear-signed message and puts the first signed message
 /** \brief Split an inline signature into message and signature
  *
  *  Takes a clear-signed message and puts the first signed message