Ticket #35879: gnuplot-bool.patch

File gnuplot-bool.patch, 1.2 KB (added by mojca (Mojca Miklavec), 12 years ago)

Patch for _Bool on 10.6 with Xcode 4.2

  • files/patch-configure-qt.diff

    old new  
    9494 #endif
    9595 
    9696        // The creation of a QApplication mangled our locale settings
     97--- src/syscfg.h.orig
     98+++ src/syscfg.h
     99@@ -342,24 +342,17 @@ typedef RETSIGTYPE (*sigfunc)__PROTO((void));
     100 #if HAVE_STDBOOL_H
     101 # include <stdbool.h>
     102 #else
     103-# if ! HAVE__BOOL
     104-#  ifdef __cplusplus
     105-typedef bool _Bool;
     106-#  else
     107-typedef unsigned char _Bool;
     108+# ifndef __cplusplus
     109+#  if ! HAVE__BOOL
     110+    typedef unsigned char _Bool;
     111 #  endif
     112+#  define bool _Bool
     113 # endif
     114-# define bool _Bool
     115 # define false 0
     116 # define true 1
     117 # define __bool_true_false_are_defined 1
     118 #endif
     119 
     120-/* May or may not fix a problem reported for Sun Studio compilers */
     121-#if defined(__SUNPRO_CC) && !defined __cplusplus && !defined(bool)
     122-#define bool unsigned char
     123-#endif
     124-
     125 #undef TRUE
     126 #define TRUE true
     127 #undef FALSE
     128--- src/wxterminal/wxt_gui.h.orig
     129+++ src/wxterminal/wxt_gui.h
     130@@ -103,11 +103,6 @@
     131 #include <vector>
     132 #include <list>
     133 
     134-/* suprisingly Cocoa version of wxWidgets does not define _Bool ! */
     135-#ifdef __WXOSX_COCOA__
     136-#define _Bool bool
     137-#endif
     138-
     139 extern "C" {
     140 /* for interactive */
     141 # include "plot.h"