diff options
| author | Stelios Tsampas <loathingkernel@gmail.com> | 2017-07-31 12:48:37 +0300 |
|---|---|---|
| committer | Stelios Tsampas <loathingkernel@gmail.com> | 2017-07-31 12:48:37 +0300 |
| commit | 01f49908879197b1715483321a9490dd71c8874b (patch) | |
| tree | 7ff0e4bd0188ffa59918d8ed1d7547c28b4d5d8e /plugins/dfcdrom | |
| parent | dcf718bdd96c3bbe27e18200f6384cd43c95c111 (diff) | |
| download | pcsxr-01f49908879197b1715483321a9490dd71c8874b.tar.gz | |
* Sync with codeplex branch (libpcsxcore, linux gui)
This commit reflects mostly changes that happened in upstream since the last sync.
Commit messages in upstream are lacking information. Most important changes are
commented below, the rest of them are either formating or just trivial stuff.
Memory viewer, invalidate dynarec
gui/DebugMemory.c
libpcsxcore/cdrom.c
libpcsxcore/gpu.c
libpcsxcore/misc.c
libpcsxcore/psxdma.c
Load binary files and psx executables
libpcsxcore/misc.c
libpcsxcore/misc.h
libpcsxcore/plugin.c
libpcsxcore/plugin.h
Support for psxida
libpcsxcore/debug.c
libpcsxcore/r3000a.c
plugins/bladesio1/connection.c
disable loading save states with digits
gui/Plugin.c
Fix psxDIV in interpreter
libpcsxcore/psxinterpreter.c
Diffstat (limited to 'plugins/dfcdrom')
| -rw-r--r-- | plugins/dfcdrom/Makefile.am | 1 | ||||
| -rwxr-xr-x | plugins/dfcdrom/cdr.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am index 1f87998b..c942fb40 100644 --- a/plugins/dfcdrom/Makefile.am +++ b/plugins/dfcdrom/Makefile.am @@ -55,4 +55,3 @@ GtkResources.h: dfcdrom.gresource.xml $(dfcdrom_gresource) EXTRA_DIST = $(glade_DATA) CLEANFILES = dfcdrom.gresource.xml GtkResources.c GtkResources.h - diff --git a/plugins/dfcdrom/cdr.c b/plugins/dfcdrom/cdr.c index ecd0d9a4..97a2735d 100755 --- a/plugins/dfcdrom/cdr.c +++ b/plugins/dfcdrom/cdr.c @@ -20,6 +20,10 @@ */ #include "cdr.h" +#if defined(__linux__) +#include <sys/types.h> +#include <sys/wait.h> +#endif #ifndef USE_NULL static char *LibName = N_("CD-ROM Drive Reader"); |