edsp: support generic and solver-specific configs

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

diff --git a/apt-pkg/contrib/sha2_internal.h b/apt-pkg/contrib/sha2_internal.h
index bf759ad45ba01030013d19832d4201a99e12dc8b..1b82d965dcc4d17f0ca38cf2336f85dda22f6d95 100644 (file)
--- a/apt-pkg/contrib/sha2_internal.h
+++ b/apt-pkg/contrib/sha2_internal.h
@@ -35,11 +35,6 @@
 #ifndef __SHA2_H__
 #define __SHA2_H__
 
 #ifndef __SHA2_H__
 #define __SHA2_H__
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-
-

 /*
  * Import u_intXX_t size_t type definitions from system headers.  You
  * may need to change this, or define these things yourself in this
 /*
  * Import u_intXX_t size_t type definitions from system headers.  You
  * may need to change this, or define these things yourself in this


@@ -49,6 +44,7 @@ extern "C" {
 
 #ifdef SHA2_USE_INTTYPES_H
 
 
 #ifdef SHA2_USE_INTTYPES_H
 

+#include <stddef.h>

 #include <inttypes.h>
 
 #endif /* SHA2_USE_INTTYPES_H */
 #include <inttypes.h>
 
 #endif /* SHA2_USE_INTTYPES_H */


@@ -189,9 +185,5 @@ char* SHA512_Data();
 
 #endif /* NOPROTO */
 
 
 #endif /* NOPROTO */
 

-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-

 #endif /* __SHA2_H__ */
 
 #endif /* __SHA2_H__ */