[Scummvm-cvs-logs] SF.net SVN: scummvm:[38223] scummvm/trunk/engines/sci/include

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Sun Feb 15 11:33:31 CET 2009


Revision: 38223
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38223&view=rev
Author:   aquadran
Date:     2009-02-15 10:33:31 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
remove DLLEXTERN

Modified Paths:
--------------
    scummvm/trunk/engines/sci/include/console.h
    scummvm/trunk/engines/sci/include/gfx_tools.h
    scummvm/trunk/engines/sci/include/kernel.h
    scummvm/trunk/engines/sci/include/resource.h
    scummvm/trunk/engines/sci/include/sciresource.h
    scummvm/trunk/engines/sci/include/script.h
    scummvm/trunk/engines/sci/include/vm.h
    scummvm/trunk/engines/sci/include/vocabulary.h

Modified: scummvm/trunk/engines/sci/include/console.h
===================================================================
--- scummvm/trunk/engines/sci/include/console.h	2009-02-15 10:32:06 UTC (rev 38222)
+++ scummvm/trunk/engines/sci/include/console.h	2009-02-15 10:33:31 UTC (rev 38223)
@@ -49,7 +49,7 @@
 #include "sci/include/gfx_operations.h"
 
 
-extern DLLEXTERN int con_passthrough;
+extern int con_passthrough;
 /* Echo all sciprintf() stuff to the text console */
 extern FILE *con_file;
 /* Echo all sciprintf() output to a text file. Note: clients of freesci.dll

Modified: scummvm/trunk/engines/sci/include/gfx_tools.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_tools.h	2009-02-15 10:32:06 UTC (rev 38222)
+++ scummvm/trunk/engines/sci/include/gfx_tools.h	2009-02-15 10:33:31 UTC (rev 38223)
@@ -44,7 +44,7 @@
 } gfxr_antialiasing_t;
 
 
-extern DLLEXTERN int gfx_crossblit_alpha_threshold; /* Crossblitting functions use this value as threshold
+extern int gfx_crossblit_alpha_threshold; /* Crossblitting functions use this value as threshold
 		 			  ** for distinguishing between transparent and opaque
 					  ** wrt alpha values */
 

Modified: scummvm/trunk/engines/sci/include/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/include/kernel.h	2009-02-15 10:32:06 UTC (rev 38222)
+++ scummvm/trunk/engines/sci/include/kernel.h	2009-02-15 10:33:31 UTC (rev 38223)
@@ -51,8 +51,8 @@
 extern int _kdebug_cheap_soundcue_hack;
 extern int stop_on_event;
 
-extern DLLEXTERN int _debug_seeking;
-extern DLLEXTERN int _debug_step_running;
+extern int _debug_seeking;
+extern int _debug_step_running;
 
 #define AVOIDPATH_DYNMEM_STRING "AvoidPath polyline"
 

Modified: scummvm/trunk/engines/sci/include/resource.h
===================================================================
--- scummvm/trunk/engines/sci/include/resource.h	2009-02-15 10:32:06 UTC (rev 38222)
+++ scummvm/trunk/engines/sci/include/resource.h	2009-02-15 10:33:31 UTC (rev 38223)
@@ -111,8 +111,6 @@
 
 #ifdef _WIN32
 #  include <io.h>
-#else /* !_WIN32 */
-#  define DLLEXTERN
 #endif /* !_WIN32 */
 
 #ifdef __BEOS__
@@ -147,17 +145,6 @@
 #  include <limits.h>
 #endif
 
-
-#ifdef _MSC_VER
-#  ifdef FREESCI_EXPORTS
-#    define DLLEXTERN
-#  else
-#    define DLLEXTERN __declspec(dllimport)
-#endif
-#else
-#  define DLLEXTERN
-#endif
-
 #if _MSC_VER || _DOS
 #  define G_DIR_SEPARATOR_S "\\"
 #  define G_DIR_SEPARATOR '\\'

Modified: scummvm/trunk/engines/sci/include/sciresource.h
===================================================================
--- scummvm/trunk/engines/sci/include/sciresource.h	2009-02-15 10:32:06 UTC (rev 38222)
+++ scummvm/trunk/engines/sci/include/sciresource.h	2009-02-15 10:33:31 UTC (rev 38223)
@@ -104,11 +104,11 @@
 #define RESSOURCE_ADDRESSING_EXTENDED 128
 #define RESSOURCE_ADDRESSING_MASK 128
 
-extern DLLEXTERN const char* sci_error_types[];
-extern DLLEXTERN const char* sci_version_types[];
-extern DLLEXTERN const char* sci_resource_types[];
-extern DLLEXTERN const char* sci_resource_type_suffixes[]; /* Suffixes for SCI1 patch files */
-extern DLLEXTERN const int sci_max_resource_nr[]; /* Highest possible resource numbers */
+extern const char* sci_error_types[];
+extern const char* sci_version_types[];
+extern const char* sci_resource_types[];
+extern const char* sci_resource_type_suffixes[]; /* Suffixes for SCI1 patch files */
+extern const int sci_max_resource_nr[]; /* Highest possible resource numbers */
 
 
 enum ResourceTypes {

Modified: scummvm/trunk/engines/sci/include/script.h
===================================================================
--- scummvm/trunk/engines/sci/include/script.h	2009-02-15 10:32:06 UTC (rev 38222)
+++ scummvm/trunk/engines/sci/include/script.h	2009-02-15 10:33:31 UTC (rev 38223)
@@ -196,7 +196,7 @@
   op_minusspi
 } sci_opcodes;
 
-extern DLLEXTERN opcode_format formats[128][4];
+extern opcode_format formats[128][4];
 
 void script_adjust_opcode_formats(int res_version);
 

Modified: scummvm/trunk/engines/sci/include/vm.h
===================================================================
--- scummvm/trunk/engines/sci/include/vm.h	2009-02-15 10:32:06 UTC (rev 38222)
+++ scummvm/trunk/engines/sci/include/vm.h	2009-02-15 10:33:31 UTC (rev 38223)
@@ -419,7 +419,7 @@
 /* Break when an exported function is called. data contains script_no << 16 |
    export_no. */
 
-extern DLLEXTERN int script_debug_flag;
+extern int script_debug_flag;
 /* Set this to 1 to activate script debugging */
 
 extern int script_error_flag;
@@ -429,7 +429,7 @@
 /* Displays the numbers of scripts when they are (un)loaded */
 
 #define SCRIPT_ABORT_WITH_REPLAY 1025
-extern DLLEXTERN int script_abort_flag;
+extern int script_abort_flag;
 /* Set this to 1 to abort script execution immediately. Aborting will leave the
 ** debug exec stack intact.
 ** Set it to SCRIPT_ABORT_WITH_REPLAY to force a replay afterwards.
@@ -444,12 +444,12 @@
 /* Number of steps executed */
 
 
-extern DLLEXTERN const char *(*_debug_get_input)(void);
+extern const char *(*_debug_get_input)(void);
 /* The function used to get input for debugging */
 
-extern DLLEXTERN int _debugstate_valid;
-extern DLLEXTERN int _debug_seeking;
-extern DLLEXTERN int _debug_step_running;
+extern int _debugstate_valid;
+extern int _debug_seeking;
+extern int _debug_step_running;
 
 
 typedef int kernel_function(struct _state* s);

Modified: scummvm/trunk/engines/sci/include/vocabulary.h
===================================================================
--- scummvm/trunk/engines/sci/include/vocabulary.h	2009-02-15 10:32:06 UTC (rev 38222)
+++ scummvm/trunk/engines/sci/include/vocabulary.h	2009-02-15 10:33:31 UTC (rev 38223)
@@ -72,7 +72,7 @@
 #define VOCAB_CLASS_IMPERATIVE_VERB 0x80
 #define VOCAB_CLASS_NUMBER 0x001
 
-extern DLLEXTERN const char *class_names[]; /* Vocabulary class names */
+extern const char *class_names[]; /* Vocabulary class names */
 
 #define VOCAB_CLASS_ANYWORD 0xff
 /* Anywords are ignored by the parser */


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