Permalink
Browse files

Merge pull request #2822 from davilla/die_LINUX-die

Die linux die
  • Loading branch information...
davilla committed Jun 4, 2013
2 parents 95d5f80 + 1e8efd9 commit 7b65508685ef7a6f3c16e9b341b2b71fafaa46b2
Showing with 688 additions and 693 deletions.
  1. +1 −1 lib/UnrarXLib/cmddata.cpp
  2. +1 −1 lib/UnrarXLib/consio.cpp
  3. +1 −1 lib/UnrarXLib/crypt.cpp
  4. +3 −3 lib/UnrarXLib/errhnd.cpp
  5. +7 −7 lib/UnrarXLib/file.cpp
  6. +8 −8 lib/UnrarXLib/filefn.cpp
  7. +1 −1 lib/UnrarXLib/filestr.cpp
  8. +1 −1 lib/UnrarXLib/find.cpp
  9. +2 −2 lib/UnrarXLib/os.hpp
  10. +1 −1 lib/UnrarXLib/pathfn.cpp
  11. +2 −2 lib/UnrarXLib/rar.cpp
  12. +2 −2 lib/UnrarXLib/suballoc.hpp
  13. +1 −1 lib/UnrarXLib/unicode.cpp
  14. +1 −1 lib/libRTV/rtv.h
  15. +3 −8 lib/libXDAAP/private.h
  16. +22 −22 xbmc/Application.cpp
  17. +4 −4 xbmc/Application.h
  18. +3 −3 xbmc/ApplicationMessenger.cpp
  19. +2 −2 xbmc/Autorun.cpp
  20. +1 −1 xbmc/BackgroundInfoLoader.cpp
  21. +2 −2 xbmc/DllPaths.h
  22. +3 −3 xbmc/DllPaths_generated.h.in
  23. +4 −4 xbmc/GUIInfoManager.cpp
  24. +4 −4 xbmc/LangInfo.cpp
  25. +3 −3 xbmc/URL.cpp
  26. +1 −1 xbmc/URL.h
  27. +22 −22 xbmc/Util.cpp
  28. +3 −3 xbmc/Util.h
  29. +1 −1 xbmc/addons/Addon.cpp
  30. +3 −3 xbmc/addons/AddonDll.h
  31. +6 −6 xbmc/addons/AddonManager.cpp
  32. +1 −1 xbmc/addons/Visualisation.cpp
  33. +1 −1 xbmc/addons/include/xbmc_addon_dll.h
  34. +1 −1 xbmc/addons/include/xbmc_pvr_types.h
  35. +1 −1 xbmc/cdrip/CDDARipJob.cpp
  36. +1 −1 xbmc/cdrip/CDDARipper.cpp
  37. +1 −1 xbmc/cdrip/DllOgg.h
  38. +1 −1 xbmc/cdrip/DllVorbis.h
  39. +1 −1 xbmc/cdrip/DllVorbisEnc.h
  40. +1 −1 xbmc/cdrip/EncoderFFmpeg.cpp
  41. +1 −1 xbmc/cdrip/EncoderLame.cpp
  42. +1 −1 xbmc/cores/AudioEngine/Sinks/AESinkNULL.cpp
  43. +3 −3 xbmc/cores/DllLoader/DllLoader.cpp
  44. +5 −5 xbmc/cores/DllLoader/DllLoaderContainer.cpp
  45. +1 −1 xbmc/cores/DllLoader/LibraryLoader.h
  46. +1 −1 xbmc/cores/DllLoader/SoLoader.h
  47. +2 −2 xbmc/cores/DllLoader/coff.cpp
  48. +1 −1 xbmc/cores/DllLoader/coff.h
  49. +1 −1 xbmc/cores/DllLoader/dll.cpp
  50. +3 −3 xbmc/cores/DllLoader/dll_tracker.h
  51. +1 −1 xbmc/cores/DllLoader/dll_tracker_file.cpp
  52. +2 −2 xbmc/cores/DllLoader/dll_util.cpp
  53. +28 −28 xbmc/cores/DllLoader/exports/emu_kernel32.cpp
  54. +5 −5 xbmc/cores/DllLoader/exports/emu_kernel32.h
  55. +41 −41 xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
  56. +10 −10 xbmc/cores/DllLoader/exports/emu_msvcrt.h
  57. +2 −2 xbmc/cores/DllLoader/exports/emu_socket/inet_aton.c
  58. +1 −1 xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h
  59. +5 −5 xbmc/cores/DllLoader/exports/wrapper.c
  60. +6 −6 xbmc/cores/DllLoader/ldt_keeper.c
  61. +15 −15 xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
  62. +3 −3 xbmc/cores/ExternalPlayer/ExternalPlayer.h
  63. +2 −2 xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
  64. +2 −2 xbmc/cores/VideoRenderers/LinuxRendererGL.h
  65. +1 −1 xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
  66. +1 −1 xbmc/cores/VideoRenderers/VideoShaders/ConvolutionKernels.cpp
  67. +1 −1 xbmc/cores/VideoRenderers/WinRenderer.h
  68. +1 −1 xbmc/cores/dvdplayer/DVDAudio.h
  69. +1 −1 xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h
  70. +1 −1 xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
  71. +1 −1 xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
  72. +2 −2 xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h
  73. +1 −1 xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h
  74. +9 −9 xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
  75. +1 −1 xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.c
  76. +2 −2 xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.h
  77. +3 −3 xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
  78. +2 −2 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp
  79. +3 −3 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
  80. +2 −2 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp
  81. +1 −1 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp
  82. +2 −2 xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
  83. +2 −2 xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMax.cpp
  84. +2 −2 xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp
  85. +2 −2 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
  86. +3 −3 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.h
  87. +1 −1 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.h
  88. +1 −1 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
  89. +1 −1 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h
  90. +1 −1 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp
  91. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
  92. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp
  93. +1 −1 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h
  94. +7 −7 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
  95. +2 −2 xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
  96. +1 −1 xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp
  97. +1 −1 xbmc/cores/dvdplayer/DVDStreamInfo.h
  98. +2 −2 xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
  99. +2 −2 xbmc/cores/omxplayer/OMXAudio.cpp
  100. +1 −1 xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp
  101. +2 −2 xbmc/cores/omxplayer/OMXImage.cpp
  102. +2 −2 xbmc/cores/omxplayer/OMXPlayerAudio.cpp
  103. +2 −2 xbmc/cores/omxplayer/OMXPlayerVideo.cpp
  104. +2 −2 xbmc/cores/omxplayer/OMXVideo.cpp
  105. +5 −5 xbmc/cores/paplayer/SPCCodec.cpp
  106. +2 −2 xbmc/cores/paplayer/SPCCodec.h
  107. +2 −2 xbmc/cores/paplayer/TimidityCodec.cpp
  108. +1 −1 xbmc/cores/paplayer/WAVcodec.cpp
  109. +2 −2 xbmc/dbwrappers/dataset.cpp
  110. +1 −1 xbmc/dbwrappers/mysqldataset.cpp
  111. +1 −1 xbmc/dbwrappers/sqlitedataset.cpp
  112. +1 −1 xbmc/dialogs/GUIDialogContextMenu.cpp
  113. +3 −3 xbmc/filesystem/AFPFile.cpp
  114. +2 −2 xbmc/filesystem/AFPFile.h
  115. +2 −2 xbmc/filesystem/CDDAFile.cpp
  116. +2 −2 xbmc/filesystem/CacheStrategy.cpp
  117. +1 −1 xbmc/filesystem/CacheStrategy.h
  118. +3 −3 xbmc/filesystem/CircularCache.cpp
  119. +1 −1 xbmc/filesystem/CircularCache.h
  120. +1 −1 xbmc/filesystem/CurlFile.cpp
  121. +3 −3 xbmc/filesystem/DirectoryFactory.cpp
  122. +1 −1 xbmc/filesystem/FTPParse.cpp
  123. +1 −1 xbmc/filesystem/File.cpp
  124. +3 −3 xbmc/filesystem/FileFactory.cpp
  125. +8 −8 xbmc/filesystem/HDDirectory.cpp
  126. +12 −12 xbmc/filesystem/HDFile.cpp
  127. +1 −1 xbmc/filesystem/IFile.h
  128. +1 −1 xbmc/filesystem/MemBufferCache.cpp
  129. +1 −1 xbmc/filesystem/RTVFile.cpp
  130. +1 −1 xbmc/filesystem/RarFile.cpp
  131. +1 −1 xbmc/filesystem/RarManager.cpp
  132. +1 −1 xbmc/filesystem/SAPDirectory.cpp
  133. +1 −1 xbmc/filesystem/SFTPFile.cpp
  134. +4 −4 xbmc/filesystem/SMBDirectory.cpp
  135. +3 −3 xbmc/filesystem/SmbFile.h
  136. +3 −3 xbmc/filesystem/SpecialProtocol.cpp
  137. +1 −1 xbmc/filesystem/SpecialProtocol.h
  138. +1 −1 xbmc/filesystem/VirtualDirectory.cpp
  139. +1 −1 xbmc/filesystem/iso9660.cpp
  140. +1 −1 xbmc/filesystem/iso9660.h
  141. +1 −1 xbmc/guilib/AnimatedGif.cpp
  142. +1 −1 xbmc/guilib/DirectXGraphics.h
  143. +1 −1 xbmc/guilib/GUICallback.h
  144. +2 −2 xbmc/guilib/GUIEditControl.cpp
  145. +2 −2 xbmc/guilib/GUIFontManager.cpp
  146. +1 −1 xbmc/guilib/GUIFontTTF.cpp
  147. +2 −2 xbmc/guilib/GUIKeyboard.h
  148. +1 −1 xbmc/guilib/GraphicContext.cpp
  149. +1 −1 xbmc/guilib/TextureBundleXBT.cpp
  150. +5 −5 xbmc/guilib/TextureBundleXPR.cpp
  151. +3 −3 xbmc/guilib/XBTFReader.cpp
  152. +1 −1 xbmc/guilib/gui3d.h
  153. +5 −5 xbmc/input/ButtonTranslator.cpp
  154. +2 −2 xbmc/input/KeyboardLayoutConfiguration.h
  155. +1 −1 xbmc/interfaces/Builtins.cpp
  156. +1 −1 xbmc/interfaces/legacy/ModuleXbmc.cpp
  157. +1 −1 xbmc/interfaces/python/LanguageHook.h
  158. +2 −2 xbmc/interfaces/python/XBPyThread.cpp
  159. +7 −7 xbmc/interfaces/python/XBPython.cpp
  160. +1 −1 xbmc/linux/ConvUtils.cpp
  161. +1 −1 xbmc/linux/LinuxTimezone.cpp
  162. +2 −2 xbmc/linux/OMXClock.cpp
  163. +3 −3 xbmc/linux/OMXCore.cpp
  164. +4 −4 xbmc/linux/PlatformDefs.h
  165. +1 −1 xbmc/linux/PosixMountProvider.cpp
  166. +9 −9 xbmc/linux/XFileUtils.cpp
  167. +1 −1 xbmc/linux/XFileUtils.h
  168. +2 −2 xbmc/linux/XHandle.h
  169. +3 −3 xbmc/linux/XMemUtils.cpp
  170. +3 −3 xbmc/linux/XTimeUtils.cpp
  171. +3 −3 xbmc/main/main.cpp
  172. +1 −1 xbmc/network/DNSNameCache.cpp
  173. +1 −1 xbmc/network/GUIDialogAccessPoints.cpp
  174. +1 −1 xbmc/network/Socket.cpp
  175. +2 −2 xbmc/network/Socket.h
  176. +2 −2 xbmc/network/UdpClient.cpp
  177. +1 −1 xbmc/network/WebServer.cpp
  178. +2 −2 xbmc/network/Zeroconf.cpp
  179. +2 −2 xbmc/network/ZeroconfBrowser.cpp
  180. +1 −1 xbmc/network/ZeroconfBrowser.h
  181. +1 −1 xbmc/network/cddb.h
  182. +1 −1 xbmc/network/linux/NetworkLinux.cpp
  183. +3 −3 xbmc/osx/atv2/xbmcclient.h
  184. +1 −1 xbmc/peripherals/PeripheralTypes.h
  185. +1 −1 xbmc/peripherals/bus/linux/PeripheralBusUSBLibUSB.cpp
  186. +1 −1 xbmc/pictures/DllImageLib.h
  187. +1 −1 xbmc/pictures/Picture.cpp
  188. +2 −2 xbmc/powermanagement/DPMSSupport.cpp
  189. +5 −5 xbmc/powermanagement/PowerManager.cpp
  190. +1 −1 xbmc/powermanagement/windows/Win32PowerSyscall.cpp
  191. +1 −1 xbmc/powermanagement/windows/Win32PowerSyscall.h
  192. +2 −2 xbmc/rendering/gl/RenderSystemGL.cpp
  193. +1 −1 xbmc/settings/AdvancedSettings.cpp
  194. +1 −1 xbmc/settings/DisplaySettings.cpp
  195. +4 −4 xbmc/settings/Settings.cpp
  196. +4 −4 xbmc/storage/DetectDVDType.cpp
  197. +11 −11 xbmc/storage/IoSupport.cpp
  198. +17 −17 xbmc/storage/MediaManager.cpp
  199. +1 −1 xbmc/storage/cdioSupport.cpp
  200. +1 −1 xbmc/test/TestBasicEnvironment.cpp
  201. +2 −2 xbmc/test/TestUtils.cpp
  202. +6 −6 xbmc/threads/Atomics.cpp
  203. +2 −2 xbmc/threads/platform/pthreads/ThreadImpl.cpp
  204. +5 −5 xbmc/utils/AliasShortcutUtils.cpp
  205. +1 −1 xbmc/utils/BitstreamStats.h
  206. +8 −8 xbmc/utils/CPUInfo.cpp
  207. +1 −1 xbmc/utils/CharsetConverter.cpp
  208. +1 −1 xbmc/utils/CryptThreading.cpp
  209. +2 −2 xbmc/utils/EndianSwap.h
  210. +1 −1 xbmc/utils/FileOperationJob.cpp
  211. +1 −1 xbmc/utils/LangCodeExpander.cpp
  212. +6 −6 xbmc/utils/MathUtils.h
  213. +3 −3 xbmc/utils/PerformanceSample.cpp
  214. +2 −2 xbmc/utils/PerformanceSample.h
  215. +1 −1 xbmc/utils/RegExp.h
  216. +5 −5 xbmc/utils/StdString.h
  217. +3 −3 xbmc/utils/Stopwatch.cpp
  218. +12 −12 xbmc/utils/SystemInfo.cpp
  219. +2 −2 xbmc/utils/SystemInfo.h
  220. +3 −3 xbmc/utils/URIUtils.cpp
  221. +1 −1 xbmc/utils/Weather.cpp
  222. +1 −1 xbmc/utils/XBMCTinyXML.h
  223. +1 −1 xbmc/utils/XMLUtils.cpp
  224. +1 −1 xbmc/utils/fastmemcpy.c
  225. +1 −1 xbmc/utils/fastmemcpy.h
  226. +1 −1 xbmc/utils/md5.cpp
  227. +2 −2 xbmc/utils/test/TestSystemInfo.cpp
  228. +1 −1 xbmc/video/VideoDatabase.h
  229. +10 −10 xbmc/video/VideoReferenceClock.cpp
  230. +2 −2 xbmc/video/VideoReferenceClock.h
  231. +1 −1 xbmc/view/ViewDatabase.cpp
  232. +2 −2 xbmc/visualizations/EGLHelpers/VisMatrixGLES.h
  233. +2 −2 xbmc/visualizations/EGLHelpers/VisShader.h
  234. +2 −2 xbmc/win32/PlatformDefs.h
  235. +4 −4 xbmc/win32/WIN32Util.cpp
  236. +8 −8 xbmc/windowing/WinEventsSDL.cpp
  237. +2 −2 xbmc/windowing/WinEventsSDL.h
  238. +1 −1 xbmc/windowing/X11/XRandR.cpp
  239. +1 −1 xbmc/windowing/osx/WinSystemOSXGL.mm
  240. +1 −1 xbmc/windowing/windows/WinEventsWin32.cpp
  241. +1 −1 xbmc/windowing/windows/WinSystemWin32.cpp
  242. +1 −1 xbmc/windows/GUIWindowDebugInfo.cpp
  243. +2 −2 xbmc/windows/GUIWindowDebugInfo.h
@@ -126,7 +126,7 @@ void CommandData::ParseDone()
}
-#if !defined(SFX_MODULE) && !defined(_WIN_CE) && !defined(_LINUX)
+#if !defined(SFX_MODULE) && !defined(_WIN_CE) && !defined(TARGET_POSIX)
void CommandData::ParseEnvVar()
{
char *EnvStr=getenv("RAR");
View
@@ -1,4 +1,4 @@
-#if !defined(_LINUX) && !defined(_XBMC)
+#if !defined(TARGET_POSIX) && !defined(_XBMC)
#include "rar.hpp"
#ifndef GUI
View
@@ -201,7 +201,7 @@ void CryptData::SetCryptKeys(char *Password,byte *Salt,bool Encrypt,bool OldOnly
Key[2]=0x7515A235L;
Key[3]=0xA4E7F123L;
memset(Psw,0,sizeof(Psw));
-#if defined(_WIN_32) && !defined(GUI) && !defined(_LINUX)
+#if defined(_WIN_32) && !defined(GUI) && !defined(TARGET_POSIX)
CharToOemBuff(Password,(char*)Psw,strlen(Password));
#else
strncpy((char *)Psw,Password,MAXPASSWORD-1);
View
@@ -265,7 +265,7 @@ extern "C"
void _stdfunction ProcessSignal(int SigType)
#endif
{
-#if defined(_WIN_32) && !defined(_LINUX)
+#if defined(_WIN_32) && !defined(TARGET_POSIX)
if (SigType==CTRL_LOGOFF_EVENT)
return(TRUE);
#endif
@@ -280,7 +280,7 @@ void _stdfunction ProcessSignal(int SigType)
#if defined(USE_RC) && !defined(SFX_MODULE) && !defined(_WIN_CE)
ExtRes.UnloadDLL();
#endif
-#if !defined(_LINUX)
+#if !defined(TARGET_POSIX)
exit(USER_BREAK);
#endif
#ifdef _WIN_32
@@ -313,7 +313,7 @@ void ErrorHandler::Throw(int Code)
throw Code;
#else
File::RemoveCreated();
-#if !defined(_XBMC) && !defined(_LINUX)
+#if !defined(_XBMC) && !defined(TARGET_POSIX)
exit(Code);
#endif
#endif
View
@@ -230,7 +230,7 @@ bool File::Close()
{*/
if (!SkipClose)
{
-#if defined(_WIN_32) || defined(_LINUX)
+#if defined(_WIN_32) || defined(TARGET_POSIX)
//success=CloseHandle(hFile) != FALSE;
m_File.Close();
#else
@@ -320,7 +320,7 @@ void File::Write(const void *Data,int Size)
while (1)
{
bool success = true;
-#if defined(_WIN_32) || defined(_LINUX)
+#if defined(_WIN_32) || defined(TARGET_POSIX)
DWORD Written=0;
if (HandleType!=FILE_HANDLENORMAL)
{
@@ -350,7 +350,7 @@ void File::Write(const void *Data,int Size)
#endif
if (ErrHandler.AskRepeatWrite(FileName))
{
-#if !defined(_WIN_32) && !defined(_LINUX)
+#if !defined(_WIN_32) && !defined(TARGET_POSIX)
clearerr(hFile);
#endif
if (Written<(unsigned int)Size && Written>0)
@@ -485,7 +485,7 @@ bool File::RawSeek(Int64 Offset,int Method)
Offset=(Method==SEEK_CUR ? Tell():FileLength())+Offset;
Method=SEEK_SET;
}*/
-#if defined(_WIN_32) || defined(_LINUX)
+#if defined(_WIN_32) || defined(TARGET_POSIX)
//LONG HighDist=int64to32(Offset>>32);
//if (SetFilePointer(hFile,int64to32(Offset),&HighDist,Method)==0xffffffff &&
if (Offset > FileLength())
@@ -510,7 +510,7 @@ bool File::RawSeek(Int64 Offset,int Method)
Int64 File::Tell()
{
-#if defined(_WIN_32) || defined(_LINUX)
+#if defined(_WIN_32) || defined(TARGET_POSIX)
//LONG HighDist=0;
//uint LowDist=SetFilePointer(hFile,0,&HighDist,FILE_CURRENT);
//Int64 pos = m_File.GetPosition();
@@ -620,7 +620,7 @@ void File::SetCloseFileTimeByName(const char *Name,RarTime *ftm,RarTime *fta)
void File::GetOpenFileTime(RarTime *ft)
{
-#if defined(_WIN_32) || defined(_LINUX)
+#if defined(_WIN_32) || defined(TARGET_POSIX)
/* FILETIME FileTime;
GetFileTime(hFile,NULL,NULL,&FileTime);
*ft=FileTime;*/
@@ -675,7 +675,7 @@ bool File::IsDevice()
{
/*if (hFile==BAD_HANDLE)
return(false);*/
-#if defined(_XBOX) || defined(_LINUX) || defined(_XBMC)
+#if defined(_XBOX) || defined(TARGET_POSIX) || defined(_XBMC)
return false;
//#ifdef _WIN_32
#elif defined(_WIN_32)
View
@@ -1,5 +1,5 @@
#include "rar.hpp"
-#ifdef _LINUX
+#ifdef TARGET_POSIX
#include "XFileUtils.h"
#endif
@@ -34,7 +34,7 @@ void SetDirTime(const char *Name,RarTime *ftm,RarTime *ftc,RarTime *fta)
bool IsRemovable(const char *Name)
{
-#if defined(_LINUX)
+#if defined(TARGET_POSIX)
return false;
//#ifdef _WIN_32
#elif defined(_WIN_32)
@@ -54,7 +54,7 @@ bool IsRemovable(const char *Name)
#ifndef SFX_MODULE
Int64 GetFreeDisk(const char *Name)
{
-#if defined(_LINUX)
+#if defined(TARGET_POSIX)
char Root[NM];
GetPathRoot(Name,Root);
@@ -146,7 +146,7 @@ Int64 GetFreeDisk(const char *Name)
bool FileExist(const char *Name,const wchar *NameW)
{
#ifdef _WIN_32
-#if !defined(_LINUX)
+#if !defined(TARGET_POSIX)
if (WinNT() && NameW!=NULL && *NameW!=0)
return(GetFileAttributesW(NameW)!=0xffffffff);
else
@@ -242,7 +242,7 @@ void PrepareToDelete(const char *Name,const wchar *NameW)
uint GetFileAttr(const char *Name,const wchar *NameW)
{
#ifdef _WIN_32
-#if !defined(_LINUX)
+#if !defined(TARGET_POSIX)
if (WinNT() && NameW!=NULL && *NameW!=0)
return(GetFileAttributesW(NameW));
else
@@ -267,7 +267,7 @@ bool SetFileAttr(const char *Name,const wchar *NameW,uint Attr)
{
bool success;
#ifdef _WIN_32
-#if !defined(_LINUX)
+#if !defined(TARGET_POSIX)
if (WinNT() && NameW!=NULL && *NameW!=0)
success=SetFileAttributesW(NameW,Attr)!=0;
else
@@ -290,7 +290,7 @@ void ConvertNameToFull(const char *Src,char *Dest)
{
#ifdef _WIN_32
//#ifndef _WIN_CE
-#if !defined(_WIN_CE) && !defined(_LINUX)
+#if !defined(_WIN_CE) && !defined(TARGET_POSIX)
char FullName[NM],*NamePtr;
if (GetFullPathName(Src,sizeof(FullName),FullName,&NamePtr))
strcpy(Dest,FullName);
@@ -329,7 +329,7 @@ void ConvertNameToFull(const wchar *Src,wchar *Dest)
#endif
{
//#ifndef _WIN_CE
-#if !defined(_WIN_CE) && !defined(_LINUX)
+#if !defined(_WIN_CE) && !defined(TARGET_POSIX)
wchar FullName[NM],*NamePtr;
if (GetFullPathNameW(Src,sizeof(FullName)/sizeof(FullName[0]),FullName,&NamePtr))
strcpyw(Dest,FullName);
@@ -113,7 +113,7 @@ bool ReadTextFile(char *Name,StringList *List,bool Config,bool AbortOnError,
CurStr++;
}
}
-#if defined(_WIN_32) && !defined(_LINUX)
+#if defined(_WIN_32) && !defined(TARGET_POSIX)
if (ConvertToAnsi)
OemToChar(CurStr,CurStr);
#endif
View
@@ -183,7 +183,7 @@ bool FindFile::FastFind(const char *FindMask,const wchar *FindMaskW,struct FindD
#ifdef _WIN_32
HANDLE FindFile::Win32Find(HANDLE hFind,const char *Mask,const wchar *MaskW,struct FindData *fd)
{
-#if !defined(_LINUX)
+#if !defined(TARGET_POSIX)
#ifndef _WIN_CE
if (WinNT())
#endif
View
@@ -1,7 +1,7 @@
#ifndef _RAR_OS_
#define _RAR_OS_
-#ifdef WIN32
+#ifdef TARGET_WINDOWS
#include <windows.h>
#endif
@@ -38,7 +38,7 @@
#include "system.h"
#include <prsht.h>
-#if defined(_LINUX)
+#if defined(TARGET_POSIX)
#include "PlatformDefs.h"
#endif
View
@@ -343,7 +343,7 @@ bool EnumConfigPaths(char *Path,int Number)
#elif defined(_WIN_32)
if (Number!=0)
return(false);
-#if !defined(_LINUX)
+#if !defined(TARGET_POSIX)
GetModuleFileName(NULL,Path,NM);
RemoveNameFromPath(Path);
#endif
View
@@ -13,7 +13,7 @@ extern "C" char **__crt0_glob_function (char *arg) { return 0; }
extern "C" void __crt0_load_environment_file (char *progname) { }
#endif
-#if !defined(GUI) && !defined(RARDLL) && !defined(_LINUX) && !defined(_XBMC)
+#if !defined(GUI) && !defined(RARDLL) && !defined(TARGET_POSIX) && !defined(_XBMC)
int main(int argc, char *argv[])
{
#ifdef _UNIX
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
#endif
-#if defined(_LINUX) || defined(_XBMC)
+#if defined(TARGET_POSIX) || defined(_XBMC)
/*-------------------------------------------------------------------------*\
XBOX interface
\*-------------------------------------------------------------------------*/
@@ -11,13 +11,13 @@ const int N1=4, N2=4, N3=4, N4=(128+3-1*N1-2*N2-3*N3)/4;
const int N_INDEXES=N1+N2+N3+N4;
// FIXME, this is probably broken on OS X.
-#if (defined(__GNUC__) || defined(_LINUX)) && !defined(__APPLE__)
+#if (defined(__GNUC__) || defined(TARGET_POSIX)) && !defined(TARGET_DARWIN)
#define _PACK_ATTR __attribute__ ((__packed__))
#else
#define _PACK_ATTR
#endif /* defined(__GNUC__) */
-#ifndef _LINUX
+#ifndef TARGET_POSIX
#pragma pack(1)
#endif
struct RAR_MEM_BLK
@@ -367,7 +367,7 @@ SupportDBCS::SupportDBCS()
void SupportDBCS::Init()
{
-#if defined(_LINUX)
+#if defined(TARGET_POSIX)
DBCSMode = true;
for (int I=0;I<sizeof(IsLeadByte)/sizeof(IsLeadByte[0]);I++)
IsLeadByte[I]=true;
View
@@ -39,7 +39,7 @@ typedef unsigned __int64 u64;
typedef __int64 s64;
#define U64F "I64"
#endif
-#ifdef _LINUX
+#ifndef _WIN32
typedef unsigned long long u64;
typedef signed long long s64;
#define U64F "l"
View
@@ -61,11 +61,6 @@ struct DAAP_SClientTAG
#endif
HTTP_ConnectionWatch *update_watch;
-
-#if !defined(WIN32) && !defined(_LINUX)
- // why is this here?
- SDiscover *discover;
-#endif
};
typedef struct
@@ -133,14 +128,14 @@ struct SDiscoverTAG
and tests it for death */
ts_mutex mtWorkerLock;
-#ifndef _LINUX
+#ifdef _WIN32
fnDiscUpdated pfnUpdateCallback;
#endif
void *pvCallbackArg;
struct CP_SThreadPool *tp;
-#ifndef _LINUX
+#ifdef _WIN32
mdnsd mdnsd_info;
#endif
int socket;
@@ -149,7 +144,7 @@ struct SDiscoverTAG
// answers
/* answers */
int pending_hosts;
-#ifndef _LINUX
+#ifdef _WIN32
SDiscover_HostList *prenamed;
SDiscover_HostList *pending;
SDiscover_HostList *have;
Oops, something went wrong.

0 comments on commit 7b65508

Please sign in to comment.