ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make hash.c dependent on miscellaneous.h and not on general.h

This commit is contained in:
twinaphex 2013-11-06 14:55:42 +01:00
parent cf20416aab
commit 389f255227
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
general.h
View File

@ -19,7 +19,6 @@
#include "boolean.h" #include "boolean.h"
#include <stdio.h> #include <stdio.h>
#include <time.h>
#include <limits.h> #include <limits.h>
#include <setjmp.h> #include <setjmp.h>
#include "driver.h" #include "driver.h"
@ -52,15 +51,9 @@
// Platform-specific headers // Platform-specific headers
// PS3 // PS3
#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) #if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
#include <sys/timer.h>
#include "ps3/ps3_input.h" #include "ps3/ps3_input.h"
#endif #endif
// libxenon
#ifdef XENON
#include <time/time.h>
#endif
// Windows // Windows
#ifdef _WIN32 #ifdef _WIN32
#ifdef _XBOX #ifdef _XBOX

4
hash.c
View File

@ -16,10 +16,10 @@
// SHA256 implementation from bSNES. Written by valditx. // SHA256 implementation from bSNES. Written by valditx.
// //
#include "general.h"
#include "hash.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "hash.h"
#include "miscellaneous.h"
#define SWAP32(x) ((uint32_t)( \ #define SWAP32(x) ((uint32_t)( \
(((uint32_t)(x) & 0x000000ff) << 24) | \ (((uint32_t)(x) & 0x000000ff) << 24) | \

8
miscellaneous.h
View File

@ -17,6 +17,14 @@
#ifndef __RARCH_MISCELLANEOUS_H #ifndef __RARCH_MISCELLANEOUS_H
#define __RARCH_MISCELLANEOUS_H #define __RARCH_MISCELLANEOUS_H
#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
#include <sys/timer.h>
#elif defined(XENON)
#include <time/time.h>
#else
#include <time.h>
#endif
#include "retroarch_logger.h" #include "retroarch_logger.h"
#ifndef max #ifndef max