[Scummvm-cvs-logs] SF.net SVN: scummvm:[48900] tools/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon May 3 13:14:11 CEST 2010


Revision: 48900
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48900&view=rev
Author:   fingolfin
Date:     2010-05-03 11:14:10 +0000 (Mon, 03 May 2010)

Log Message:
-----------
TOOLS: Get rid of unnecessary #include <unistd.h>.

If it is needed after all on some systems, please re-add it
(or tell me) with a comment explaining for what it is needed.

Modified Paths:
--------------
    tools/trunk/compress.cpp
    tools/trunk/engines/agos/compress_agos.cpp
    tools/trunk/engines/kyra/compress_kyra.cpp
    tools/trunk/engines/kyra/kyra_pak.cpp
    tools/trunk/engines/queen/compress_queen.cpp
    tools/trunk/engines/saga/compress_saga.cpp
    tools/trunk/engines/sci/compress_sci.cpp
    tools/trunk/engines/scumm/compress_scumm_bun.cpp
    tools/trunk/engines/scumm/compress_scumm_san.cpp
    tools/trunk/engines/scumm/compress_scumm_sou.cpp
    tools/trunk/engines/sword1/compress_sword1.cpp
    tools/trunk/engines/sword2/compress_sword2.cpp
    tools/trunk/engines/tinsel/compress_tinsel.cpp
    tools/trunk/engines/tucker/compress_tucker.cpp
    tools/trunk/sci/scipack.cpp
    tools/trunk/sci/sfx/mt32_GM_mapping/main.c

Modified: tools/trunk/compress.cpp
===================================================================
--- tools/trunk/compress.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/compress.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -25,9 +25,6 @@
 #include <string.h>
 #include <sstream>
 #include <stdio.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: tools/trunk/engines/agos/compress_agos.cpp
===================================================================
--- tools/trunk/engines/agos/compress_agos.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/agos/compress_agos.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -22,9 +22,6 @@
 
 #include <string.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "compress_agos.h"
 

Modified: tools/trunk/engines/kyra/compress_kyra.cpp
===================================================================
--- tools/trunk/engines/kyra/compress_kyra.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/kyra/compress_kyra.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -23,9 +23,6 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 
 #include "compress_kyra.h"

Modified: tools/trunk/engines/kyra/kyra_pak.cpp
===================================================================
--- tools/trunk/engines/kyra/kyra_pak.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/kyra/kyra_pak.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -22,9 +22,6 @@
 
 #include <assert.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "kyra_pak.h"
 

Modified: tools/trunk/engines/queen/compress_queen.cpp
===================================================================
--- tools/trunk/engines/queen/compress_queen.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/queen/compress_queen.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -21,9 +21,6 @@
  */
 
 #include <string.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "common/util.h"
 #include "compress.h"

Modified: tools/trunk/engines/saga/compress_saga.cpp
===================================================================
--- tools/trunk/engines/saga/compress_saga.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/saga/compress_saga.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -25,9 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "compress.h"
 #include "compress_saga.h"

Modified: tools/trunk/engines/sci/compress_sci.cpp
===================================================================
--- tools/trunk/engines/sci/compress_sci.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/sci/compress_sci.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -23,9 +23,6 @@
 // by m_kiewitz
 
 #include <stdlib.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "compress.h"
 #include "common/endian.h"

Modified: tools/trunk/engines/scumm/compress_scumm_bun.cpp
===================================================================
--- tools/trunk/engines/scumm/compress_scumm_bun.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/scumm/compress_scumm_bun.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -24,9 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "common/util.h"
 #include "common/endian.h"

Modified: tools/trunk/engines/scumm/compress_scumm_san.cpp
===================================================================
--- tools/trunk/engines/scumm/compress_scumm_san.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/scumm/compress_scumm_san.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -25,9 +25,6 @@
 #include <string.h>
 #include <zlib.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "compress_scumm_san.h"
 #include "common/endian.h"

Modified: tools/trunk/engines/scumm/compress_scumm_sou.cpp
===================================================================
--- tools/trunk/engines/scumm/compress_scumm_sou.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/scumm/compress_scumm_sou.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -22,9 +22,6 @@
 
 #include <assert.h>
 #include <string.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "compress_scumm_sou.h"
 

Modified: tools/trunk/engines/sword1/compress_sword1.cpp
===================================================================
--- tools/trunk/engines/sword1/compress_sword1.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/sword1/compress_sword1.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -24,9 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "compress_sword1.h"
 

Modified: tools/trunk/engines/sword2/compress_sword2.cpp
===================================================================
--- tools/trunk/engines/sword2/compress_sword2.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/sword2/compress_sword2.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -20,9 +20,6 @@
  *
  */
 
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "compress_sword2.h"
 

Modified: tools/trunk/engines/tinsel/compress_tinsel.cpp
===================================================================
--- tools/trunk/engines/tinsel/compress_tinsel.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/tinsel/compress_tinsel.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -23,9 +23,6 @@
 // By Jimi (m [underline] kiewitz [AT] users.sourceforge.net)
 
 #include <stdlib.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "compress.h"
 #include "common/endian.h"

Modified: tools/trunk/engines/tucker/compress_tucker.cpp
===================================================================
--- tools/trunk/engines/tucker/compress_tucker.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/engines/tucker/compress_tucker.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -23,9 +23,6 @@
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
 
 #include "common/util.h"
 #include "compress.h"

Modified: tools/trunk/sci/scipack.cpp
===================================================================
--- tools/trunk/sci/scipack.cpp	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/sci/scipack.cpp	2010-05-03 11:14:10 UTC (rev 48900)
@@ -30,9 +30,6 @@
 #include <resource.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
 
 #define COPY_BLOCK_SIZE 512
 

Modified: tools/trunk/sci/sfx/mt32_GM_mapping/main.c
===================================================================
--- tools/trunk/sci/sfx/mt32_GM_mapping/main.c	2010-05-03 09:33:15 UTC (rev 48899)
+++ tools/trunk/sci/sfx/mt32_GM_mapping/main.c	2010-05-03 11:14:10 UTC (rev 48900)
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <stdlib.h>
 
 #include "mt32_timbres.c"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list