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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Feb 25 16:23:00 CET 2008


Revision: 30966
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30966&view=rev
Author:   fingolfin
Date:     2008-02-25 07:23:00 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
Removed dead code

Modified Paths:
--------------
    tools/trunk/compress.h
    tools/trunk/util.h

Modified: tools/trunk/compress.h
===================================================================
--- tools/trunk/compress.h	2008-02-25 14:43:15 UTC (rev 30965)
+++ tools/trunk/compress.h	2008-02-25 15:23:00 UTC (rev 30966)
@@ -27,10 +27,6 @@
 #include <vorbis/vorbisenc.h>
 #include <FLAC/stream_encoder.h>
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
 /* These are the defaults parameters for the Lame invocation */
 #define minBitrDef 24
 #define maxBitrDef 64
@@ -69,8 +65,4 @@
 extern void encodeRaw(char *rawData, int length, int samplerate, const char *outname, CompressMode compmode);
 extern void setRawAudioType(bool isLittleEndian, bool isStereo, uint8 bitsPerSample);
 
-#if defined(__cplusplus)
-}
 #endif
-
-#endif

Modified: tools/trunk/util.h
===================================================================
--- tools/trunk/util.h	2008-02-25 14:43:15 UTC (rev 30965)
+++ tools/trunk/util.h	2008-02-25 15:23:00 UTC (rev 30966)
@@ -52,19 +52,7 @@
 typedef signed short int16;
 typedef signed int int32;
 
-#if !defined(__cplusplus)
-typedef uint8 bool;
-#define false 0
-#define true 1
 
-/* If your C compiler doesn't support 'inline', please add a check for it. */
-#if defined(_MSC_VER)
-#define inline __inline
-#endif
-
-#endif
-
-
 /*
  * Various utility macros
  */
@@ -198,10 +186,6 @@
 #endif
 
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
 /* File I/O */
 uint8 readByte(FILE *fp);
 uint16 readUint16BE(FILE *fp);
@@ -223,8 +207,4 @@
 void getPath(const char *fullpath, char *path);
 void getFilename(const char *fullpath, char *filename);
 
-#if defined(__cplusplus)
-}
 #endif
-
-#endif


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