remove DLLEXTERN

svn-id: r38223

8 files changed, 17 insertions, 30 deletions

diff --git a/engines/sci/include/console.h b/engines/sci/include/console.h
index 9051b6bcd9..e56ab5e461 100644
--- a/engines/sci/include/console.h
+++ b/engines/sci/include/console.h
@@ -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
diff --git a/engines/sci/include/gfx_tools.h b/engines/sci/include/gfx_tools.h
index 45005302a7..4ab5c0c277 100644
--- a/engines/sci/include/gfx_tools.h
+++ b/engines/sci/include/gfx_tools.h
@@ -44,7 +44,7 @@ typedef enum {
 } 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 */
 
diff --git a/engines/sci/include/kernel.h b/engines/sci/include/kernel.h
index 639db44d65..d34a884cd5 100644
--- a/engines/sci/include/kernel.h
+++ b/engines/sci/include/kernel.h
@@ -51,8 +51,8 @@ extern int _kdebug_cheap_event_hack;
 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"
 
diff --git a/engines/sci/include/resource.h b/engines/sci/include/resource.h
index 4422bcb139..e1133d9f0a 100644
--- a/engines/sci/include/resource.h
+++ b/engines/sci/include/resource.h
@@ -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 '\\'
diff --git a/engines/sci/include/sciresource.h b/engines/sci/include/sciresource.h
index c1eb9bd29b..c2d70f594f 100644
--- a/engines/sci/include/sciresource.h
+++ b/engines/sci/include/sciresource.h
@@ -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 {
diff --git a/engines/sci/include/script.h b/engines/sci/include/script.h
index 4c7892ebae..d877909d41 100644
--- a/engines/sci/include/script.h
+++ b/engines/sci/include/script.h
@@ -196,7 +196,7 @@ typedef enum { /* FIXME */
   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);
 
diff --git a/engines/sci/include/vm.h b/engines/sci/include/vm.h
index 1a8a799852..1bf3353c3d 100644
--- a/engines/sci/include/vm.h
+++ b/engines/sci/include/vm.h
@@ -419,7 +419,7 @@ typedef struct _breakpoint {
 /* 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 @@ extern int script_checkloads_flag;
 /* 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 @@ extern int script_step_counter;
 /* 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);
diff --git a/engines/sci/include/vocabulary.h b/engines/sci/include/vocabulary.h
index 2219f0ee2a..4bf0a870ef 100644
--- a/engines/sci/include/vocabulary.h
+++ b/engines/sci/include/vocabulary.h
@@ -72,7 +72,7 @@ typedef struct opcode_
 #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 */