Permalink
Browse files

Fix C++ nonconformance on Windows with MinGW by adding appropriate ca…

…sts.
  • Loading branch information...
1 parent 44a1aa6 commit 6c9484f4885ac68f0b9b0bbf902651910e5d0bd6 @feeley feeley committed Feb 1, 2012
Showing with 15 additions and 8 deletions.
  1. +4 −1 configure
  2. +4 −1 configure.ac
  3. +2 −2 include/stamp.h
  4. +5 −4 lib/os_tty.c
View
@@ -22681,7 +22681,10 @@ echo "${ECHO_T}$DASH_shared" >&6; }
FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fno_strict_aliasing"
FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fwrapv"
FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fno_keep_inline_dllexport"
- #FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fpermissive"
+
+# if test "$ENABLE_CPLUSPLUS" = yes; then
+# FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fpermissive"
+# fi
# It isn't clear these are useful:
# FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fno_trapping_math$DASH_fno_strict_aliasing$DASH_fwrapv$DASH_fexpensive_optimizations$DASH_fforce_addr$DASH_fpeephole2$DASH_falign_jumps$DASH_falign_functions$DASH_fno_function_cse$DASH_ftree_copyrename$DASH_ftree_fre$DASH_ftree_dce$DASH_fschedule_interblock$DASH_fregmove$DASH_fgcse_las$DASH_freorder_functions$DASH_fcaller_saves$DASH_fno_if_conversion2$DASH_foptimize_sibling_calls$DASH_fcse_skip_blocks$DASH_funit_at_a_time$DASH_finline_functions"
View
@@ -1159,7 +1159,10 @@ if test "$C_COMP_GNUC" = yes; then
FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fno_strict_aliasing"
FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fwrapv"
FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fno_keep_inline_dllexport"
- #FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fpermissive"
+
+# if test "$ENABLE_CPLUSPLUS" = yes; then
+# FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fpermissive"
+# fi
# It isn't clear these are useful:
# FLAGS_OBJ_DYN="$FLAGS_OBJ_DYN$DASH_fno_trapping_math$DASH_fno_strict_aliasing$DASH_fwrapv$DASH_fexpensive_optimizations$DASH_fforce_addr$DASH_fpeephole2$DASH_falign_jumps$DASH_falign_functions$DASH_fno_function_cse$DASH_ftree_copyrename$DASH_ftree_fre$DASH_ftree_dce$DASH_fschedule_interblock$DASH_fregmove$DASH_fgcse_las$DASH_freorder_functions$DASH_fcaller_saves$DASH_fno_if_conversion2$DASH_foptimize_sibling_calls$DASH_fcse_skip_blocks$DASH_funit_at_a_time$DASH_finline_functions"
View
@@ -2,5 +2,5 @@
* Time stamp of last source code repository commit.
*/
-#define ___STAMP_YMD 20120131
-#define ___STAMP_HMS 143058
+#define ___STAMP_YMD 20120201
+#define ___STAMP_HMS 133130
View
@@ -1,6 +1,6 @@
/* File: "os_tty.c" */
-/* Copyright (c) 1994-2011 by Marc Feeley, All Rights Reserved. */
+/* Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved. */
/*
* This module implements the operating system specific routines
@@ -3396,7 +3396,8 @@ ___U8 *text_arg;)
{
if (text_arg != NULL)
{
- SetWindowTextA (cons_wind, text_arg); /* ignore error */
+ SetWindowTextA (cons_wind,
+ ___CAST(LPCSTR,text_arg)); /* ignore error */
}
else
{
@@ -4496,7 +4497,7 @@ int len;)
if (global_copy != NULL)
{
- ___U16 *locked_copy = GlobalLock (global_copy);
+ ___U16 *locked_copy = ___CAST(___U16*,GlobalLock (global_copy));
if (locked_copy == NULL)
GlobalFree (global_copy);
@@ -4581,7 +4582,7 @@ ___device_tty *self;)
if (global_copy != NULL)
{
- ___U16 *locked_copy = GlobalLock (global_copy);
+ ___U16 *locked_copy = ___CAST(___U16*,GlobalLock (global_copy));
if (locked_copy != NULL)
{

0 comments on commit 6c9484f

Please sign in to comment.