Author: akhaldi Date: Tue Jan 21 18:01:34 2014 New Revision: 61748
URL: http://svn.reactos.org/svn/reactos?rev=61748&view=rev Log: [CRYPT32] * Move cryptres.h inclusion to the main header. CORE-7716
Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h trunk/reactos/dll/win32/crypt32/cryptres.h trunk/reactos/dll/win32/crypt32/object.c trunk/reactos/dll/win32/crypt32/oid.c
Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_p... ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] Tue Jan 21 18:01:34 2014 @@ -19,7 +19,7 @@ #ifndef __CRYPT32_PRIVATE_H__ #define __CRYPT32_PRIVATE_H__
-#include <config.h> +#include <wine/config.h> #include <wine/port.h>
#include <assert.h> @@ -47,6 +47,8 @@ #include <wine/list.h> #include <wine/exception.h> #include <wine/debug.h> + +#include "cryptres.h"
/* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) @@ -460,4 +462,4 @@ */ #define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0)
-#endif +#endif /* __CRYPT32_PRIVATE_H__ */
Modified: trunk/reactos/dll/win32/crypt32/cryptres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cryptres.... ============================================================================== --- trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] Tue Jan 21 18:01:34 2014 @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __WINE_CRYPTRES_H__ #define __WINE_CRYPTRES_H__
Modified: trunk/reactos/dll/win32/crypt32/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/object.c?... ============================================================================== --- trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] Tue Jan 21 18:01:34 2014 @@ -21,8 +21,6 @@ #include "crypt32_private.h"
#include <wintrust.h> - -#include "cryptres.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?rev... ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Tue Jan 21 18:01:34 2014 @@ -18,8 +18,6 @@ */
#include "crypt32_private.h" - -#include "cryptres.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);