Download as
Browse Code »

Commit 29238cbbd2fcc9d147eccb43a2056e74d8a8b5c6

Authored by Perry Werneck
1 parent bacddfe6
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustes para compilar no formato novo.

Showing 33 changed files with 69 additions and 61 deletions   Show diff stats
configure.ac
  Diff comments   View file @29238cb
... ... @@ -205,6 +205,14 @@ esac
205 205 # It's easier to test hllapi on linux
206 206 AC_CONFIG_FILES(src/plugins/hllapi/Makefile)
207 207  
  208 +#--[ lib3270 defines ]----------------------------------------------------------------------------------------------------------------------------------------
  209 +
  210 +LIB3270_CFLAGS=-I$ac_pwd/src/include
  211 +PW3270_CFLAGS=-I$ac_pwd/src/pw3270/include
  212 +
  213 +AC_SUBST(LIB3270_CFLAGS)
  214 +AC_SUBST(PW3270_CFLAGS)
  215 +
208 216 #--[ Check gettext ]------------------------------------------------------------------------------------------------------------------------------------------
209 217  
210 218 AC_PATH_TOOL([XGETTEXT], [xgettext], [no])
... ... @@ -540,6 +548,8 @@ AC_CHECK_FUNCS(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO) )
540 548 AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) )
541 549 AC_CHECK_FUNC(strtok_r, AC_DEFINE(HAVE_STRTOK_R) )
542 550  
  551 +
  552 +
543 553 PKG_CHECK_EXISTS
544 554  
545 555 #--[ GTK 2/3 check ]------------------------------------------------------------------------------------------------------------------------------------------
... ...
src/classlib/class.mak.in
  Diff comments   View file @29238cb
... ... @@ -37,9 +37,10 @@ CLASS_RELEASE_OBJECTS=$(foreach SRC, $(basename $(CLASS_SRC)), $(OBJRLS)/classli
37 37 $(OBJDBG)/classlib/%.o: $(CLASSLIBDIR)/%.cc
38 38 @echo " CC `basename $@`"
39 39 @$(MKDIR) `dirname $@`
40   - @$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) $(DEBUG_CFLAGS) -o $@ -c $<
  40 + @$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(DEBUG_CFLAGS) -o $@ -c $<
41 41  
42 42 $(OBJRLS)/classlib/%.o: $(CLASSLIBDIR)/%.cc
43 43 @echo " CC `basename $@`"
44 44 @$(MKDIR) `dirname $@`
45   - @$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $<
  45 + @$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $<
  46 +
... ...
src/include/plugin.mak.in
  Diff comments   View file @29238cb
... ... @@ -74,27 +74,26 @@ LIB3270_MODE ?= Default
74 74 DLL_NAME ?= @DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@
75 75 PLUGIN_NAME ?= plugins/$(MODULE_NAME)@DLLEXT@
76 76  
  77 +PW3270_CFLAGS=@PW3270_CFLAGS@
  78 +LIB3270_CFLAGS=@LIB3270_CFLAGS@
  79 +
77 80 ifeq ($(LIB3270_MODE),Debug)
78 81 PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l$(PACKAGE_TARNAME)
79   - PW3270_CFLAGS=-I../../../src/include
80 82 LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270
81   - LIB270_CFLAGS=-I../../../src/include
82 83 endif
83 84  
84 85 ifeq ($(LIB3270_MODE),Release)
85 86 BINRLS=../../../.bin/Release
86 87 PW3270_LIBS=-L$(BINRLS)@DLLDIR@ -l$(PACKAGE_TARNAME)
87   - PW3270_CFLAGS=-I../../../src/include
88 88 LIB3270_LIBS=-L$(BINRLS)@DLLDIR@ -l3270
89   - LIB270_CFLAGS=-I../../../src/include
90 89 endif
91 90  
92   -ifeq ($(LIB3270_MODE),Default)
93   - LIB3270_LIBS ?= `pkg-config --libs lib3270`
94   - LIB3270_CFLAGS ?= `pkg-config --cflags lib3270`
95   - PW3270_LIBS ?= `pkg-config --libs pw3270 lib3270`
96   - PW3270_CFLAGS ?= `pkg-config --cflags pw3270 lib3270`
97   -endif
  91 +#ifeq ($(LIB3270_MODE),Default)
  92 +# LIB3270_LIBS ?= `pkg-config --libs lib3270`
  93 +# LIB3270_CFLAGS ?= `pkg-config --cflags lib3270`
  94 +# PW3270_LIBS ?= `pkg-config --libs pw3270 lib3270`
  95 +# PW3270_CFLAGS ?= `pkg-config --cflags pw3270 lib3270`
  96 +#endif
98 97  
99 98 GTK_CFLAGS ?= @GTK_CFLAGS@ @GTKMAC_CFLAGS@
100 99 GTK_LIBS ?= @GTK_LIBS@ @GTKMAC_LIBS@
... ... @@ -102,22 +101,22 @@ GTK_LIBS ?= @GTK_LIBS@ @GTKMAC_LIBS@
102 101 $(OBJDBG)/%.o: %.c $(DEPENDS)
103 102 @echo " CC `basename $@`"
104 103 @$(MKDIR) `dirname $@`
105   - @$(CC) $(DLL_CFLAGS) $(CFLAGS) $(DEBUG_CFLAGS) $(PW3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $<
  104 + @$(CC) $(DLL_CFLAGS) $(CFLAGS) $(DEBUG_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $<
106 105  
107 106 $(OBJDBG)/%.o: %.cc $(DEPENDS)
108 107 @echo " CC `basename $@`"
109 108 @$(MKDIR) `dirname $@`
110   - @$(CXX) $(DLL_CFLAGS) $(CFLAGS) $(DEBUG_CFLAGS) $(PW3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $<
  109 + @$(CXX) $(DLL_CFLAGS) $(CFLAGS) $(DEBUG_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $<
111 110  
112 111 $(OBJRLS)/%.o: %.c $(DEPENDS)
113 112 @echo " CC `basename $@`"
114 113 @$(MKDIR) `dirname $@`
115   - @$(CC) $(DLL_CFLAGS) $(CFLAGS) $(PW3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $<
  114 + @$(CC) $(DLL_CFLAGS) $(CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $<
116 115  
117 116 $(OBJRLS)/%.o: %.cc $(DEPENDS)
118 117 @echo " CC `basename $@`"
119 118 @$(MKDIR) `dirname $@`
120   - @$(CXX) $(DLL_CFLAGS) $(CFLAGS) $(PW3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $<
  119 + @$(CXX) $(DLL_CFLAGS) $(CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $<
121 120  
122 121 #---[ Targets ]----------------------------------------------------------------
123 122  
... ...
src/include/rules.mak.in
  Diff comments   View file @29238cb
... ... @@ -34,7 +34,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
34 34 PACKAGE_TARNAME=@PACKAGE_TARNAME@
35 35 EXEEXT=@EXEEXT@
36 36  
37   -LIB3270_CFLAGS ?= `pkg-config --cflags lib3270`
  37 +LIB3270_CFLAGS ?= @LIB3270_CFLAGS@
38 38 LIB3270_LIBS ?= `pkg-config --libs lib3270`
39 39 DLL_FLAGS=@DLL_FLAGS@
40 40  
... ...
src/java/Makefile.in
  Diff comments   View file @29238cb
... ... @@ -72,7 +72,6 @@ OBJRLS ?= $(OBJDIR)/Release
72 72 #---[ lib3270 common class ]---------------------------------------------------
73 73  
74 74 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
75   -PW3270_CFLAGS=-I../include
76 75 CLASSLIBDIR=../classlib
77 76 include $(CLASSLIBDIR)/class.mak
78 77  
... ... @@ -80,11 +79,10 @@ include $(CLASSLIBDIR)/class.mak
80 79  
81 80 CXXFLAGS=@CFLAGS@ @CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -I../include
82 81  
83   -PW3270_LIBS ?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270
84   -PW3270_CFLAGS ?= -I../include
  82 +PW3270_LIBS ?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270
85 83  
86 84 PLUGIN_CFLAGS=@CXXFLAGS@ -DPW3270_PLUGIN -Wno-deprecated-declarations @DLL_CFLAGS@ @JNI_CPPFLAGS@ -DJNIDIR="\"$(jnidir)\"" \
87   - -DJARDIR="\"$(jvmjardir)\"" @GTK_CFLAGS@ @GTKMAC_CFLAGS@ $(PW3270_CFLAGS)
  85 + -DJARDIR="\"$(jvmjardir)\"" @GTK_CFLAGS@ @GTKMAC_CFLAGS@ @PW3270_CFLAGS@ @LIB3270_CFLAGS@
88 86  
89 87 PLUGIN_LIBS=@GTK_LIBS@ @GTKMAC_LIBS@ @INTL_LIBS@ @JVM_LIBS@
90 88  
... ...
src/java/call.cc
  Diff comments   View file @29238cb
... ... @@ -29,7 +29,7 @@
29 29  
30 30  
31 31 #include "private.h"
32   - #include <pw3270/v3270.h>
  32 + #include <v3270.h>
33 33 #include <lib3270/trace.h>
34 34 #include <lib3270/log.h>
35 35  
... ...
src/java/plugin.cc
  Diff comments   View file @29238cb
... ... @@ -51,7 +51,7 @@
51 51  
52 52 #include <pw3270.h>
53 53 #include <pw3270/plugin.h>
54   - #include <pw3270/v3270.h>
  54 + #include <v3270.h>
55 55 #include <lib3270/actions.h>
56 56 #include <lib3270/log.h>
57 57 #include <lib3270/trace.h>
... ...
src/java/startstop.cc
  Diff comments   View file @29238cb
... ... @@ -50,7 +50,7 @@
50 50  
51 51 #include <pw3270.h>
52 52 #include <pw3270/plugin.h>
53   - #include <pw3270/v3270.h>
  53 + #include <v3270.h>
54 54 #include <lib3270/actions.h>
55 55 #include <lib3270/log.h>
56 56 #include <lib3270/trace.h>
... ...
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @29238cb
... ... @@ -81,11 +81,12 @@ GDBUS_LIBS=@GDBUS_LIBS@
81 81 GLIB_LIBS=@GLIB_LIBS@
82 82 GTK_LIBS=@GTK_LIBS@
83 83  
  84 +PW3270_CFLAGS=@PW3270_CFLAGS@
  85 +LIB3270_CFLAGS=@LIB3270_CFLAGS@
  86 +
84 87 ifeq ($(LIB3270_MODE),Debug)
85 88 PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l$(PACKAGE_TARNAME)
86   - PW3270_CFLAGS=-I../../../src/include
87 89 LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270
88   - LIB3270_CFLAGS=-I../../../src/include
89 90 endif
90 91  
91 92 ifeq ($(LIB3270_MODE),Release)
... ... @@ -95,12 +96,12 @@ ifeq ($(LIB3270_MODE),Release)
95 96 LIB3270_CFLAGS=-I../../../src/include
96 97 endif
97 98  
98   -ifeq ($(LIB3270_MODE),Default)
99   - LIB3270_LIBS ?= `pkg-config --libs lib3270`
100   - LIB3270_CFLAGS ?= `pkg-config --cflags lib3270`
101   - PW3270_LIBS ?= `pkg-config --libs pw3270 lib3270`
102   - PW3270_CFLAGS ?= `pkg-config --cflags pw3270 lib3270`
103   -endif
  99 +#ifeq ($(LIB3270_MODE),Default)
  100 +# LIB3270_LIBS ?= `pkg-config --libs lib3270`
  101 +# LIB3270_CFLAGS ?= `pkg-config --cflags lib3270`
  102 +# PW3270_LIBS ?= `pkg-config --libs pw3270 lib3270`
  103 +# PW3270_CFLAGS ?= `pkg-config --cflags pw3270 lib3270`
  104 +#endif
104 105  
105 106 #---[ Rules ]------------------------------------------------------------------
106 107  
... ...
src/plugins/dbus3270/gobject.c
  Diff comments   View file @29238cb
... ... @@ -42,7 +42,7 @@
42 42 #include <lib3270/config.h>
43 43 #include <lib3270.h>
44 44 #include <pw3270.h>
45   -#include <pw3270/v3270.h>
  45 +#include <v3270.h>
46 46 #include <lib3270/actions.h>
47 47 #include <lib3270/charset.h>
48 48  
... ...
src/plugins/hllapi/pluginmain.c
  Diff comments   View file @29238cb
... ... @@ -38,7 +38,7 @@
38 38 #endif // _WIN32
39 39  
40 40 #include <pw3270/plugin.h>
41   - #include <pw3270/v3270.h>
  41 + #include <v3270.h>
42 42 #include <pw3270/ipcpackets.h>
43 43 #include <lib3270/actions.h>
44 44 #include <lib3270/charset.h>
... ...
src/plugins/rx3270/pluginmain.cc
  Diff comments   View file @29238cb
... ... @@ -44,7 +44,7 @@
44 44 #include <string.h>
45 45 #include <pw3270.h>
46 46 #include <pw3270/plugin.h>
47   - #include <pw3270/v3270.h>
  47 + #include <v3270.h>
48 48 #include <pw3270/trace.h>
49 49 #include <lib3270/actions.h>
50 50 #include <lib3270/log.h>
... ...
src/pw3270/Makefile.in
  Diff comments   View file @29238cb
... ... @@ -177,7 +177,7 @@ $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): \
177 177 .bin/Debug/v3270ft.a: \
178 178 v3270ft/*
179 179  
180   - $(MAKE) BINDIR=../.bin -C v3270ft Debug
  180 + @$(MAKE) BINDIR=../.bin -C v3270ft Debug
181 181  
182 182  
183 183 $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: \
... ...
src/pw3270/dialog.c
  Diff comments   View file @29238cb
... ... @@ -31,7 +31,7 @@
31 31  
32 32 #include <lib3270/config.h>
33 33 #include "globals.h"
34   - #include <pw3270/v3270.h>
  34 + #include <v3270.h>
35 35  
36 36 #if defined(HAVE_LIBSSL)
37 37 #include <openssl/ssl.h>
... ...
src/pw3270/globals.h
  Diff comments   View file @29238cb
... ... @@ -36,7 +36,7 @@
36 36 #include <gtk/gtk.h>
37 37  
38 38 #include <pw3270.h>
39   - #include <pw3270/v3270.h>
  39 + #include <v3270.h>
40 40  
41 41 // Special actions
42 42 enum
... ...
src/pw3270/hostdialog.c
  Diff comments   View file @29238cb
... ... @@ -28,7 +28,7 @@
28 28 */
29 29  
30 30 #include "globals.h"
31   - #include <pw3270/v3270.h>
  31 + #include <v3270.h>
32 32  
33 33 /*--[ Globals ]--------------------------------------------------------------------------------------*/
34 34  
... ...
src/pw3270/main.c
  Diff comments   View file @29238cb
... ... @@ -37,7 +37,7 @@
37 37 #include <gtkosxapplication.h>
38 38 #endif // HAVE_GTKMAC
39 39  
40   -#include <pw3270/v3270.h>
  40 +#include <v3270.h>
41 41 #include <pw3270/plugin.h>
42 42 #include "v3270/accessible.h"
43 43 #include <lib3270/trace.h>
... ...
src/pw3270/print.c
  Diff comments   View file @29238cb
... ... @@ -30,7 +30,7 @@
30 30 */
31 31  
32 32 #include "globals.h"
33   - #include <pw3270/v3270.h>
  33 + #include <v3270.h>
34 34 #include <lib3270/selection.h>
35 35 #include <lib3270/trace.h>
36 36  
... ...
src/pw3270/uiparser/action.c
  Diff comments   View file @29238cb
... ... @@ -30,7 +30,7 @@
30 30 */
31 31  
32 32 #include <stdlib.h>
33   - #include <pw3270/v3270.h>
  33 + #include <v3270.h>
34 34 #include "private.h"
35 35  
36 36 /*--[ Implement ]------------------------------------------------------------------------------------*/
... ...
src/pw3270/uiparser/button.c
  Diff comments   View file @29238cb
... ... @@ -29,7 +29,7 @@
29 29 */
30 30  
31 31 #include "keypad.h"
32   - #include <pw3270/v3270.h>
  32 + #include <v3270.h>
33 33  
34 34 /*--[ Globals ]--------------------------------------------------------------------------------------*/
35 35  
... ...
src/pw3270/uiparser/parser.c
  Diff comments   View file @29238cb
... ... @@ -30,7 +30,7 @@
30 30 */
31 31  
32 32 #include "private.h"
33   - #include <pw3270/v3270.h>
  33 + #include <v3270.h>
34 34  
35 35 #ifdef HAVE_GTKMAC
36 36 #include <gtkmacintegration/gtk-mac-menu.h>
... ...
src/pw3270/v3270/accessible.c
  Diff comments   View file @29238cb
... ... @@ -38,7 +38,7 @@
38 38  
39 39 #include <pw3270.h>
40 40 #include <lib3270/log.h>
41   - #include <pw3270/v3270.h>
  41 + #include <v3270.h>
42 42 #include "private.h"
43 43 #include "accessible.h"
44 44  
... ...
src/pw3270/v3270/draw.c
  Diff comments   View file @29238cb
... ... @@ -32,7 +32,7 @@
32 32 #include <pw3270.h>
33 33 #include <lib3270.h>
34 34 #include <lib3270/session.h>
35   - #include <pw3270/v3270.h>
  35 + #include <v3270.h>
36 36 #include "private.h"
37 37  
38 38 /*--[ Implement ]------------------------------------------------------------------------------------*/
... ...
src/pw3270/v3270/hostselect.c
  Diff comments   View file @29238cb
... ... @@ -29,7 +29,7 @@
29 29  
30 30 #include "hostselect.h"
31 31 #include <lib3270/log.h>
32   - #include <pw3270/v3270.h>
  32 + #include <v3270.h>
33 33  
34 34 /*--[ Widget definition ]----------------------------------------------------------------------------*/
35 35  
... ...
src/pw3270/v3270/keyboard.c
  Diff comments   View file @29238cb
... ... @@ -38,7 +38,7 @@
38 38 #include <string.h>
39 39 #include <gdk/gdk.h>
40 40  
41   - #include <pw3270/v3270.h>
  41 + #include <v3270.h>
42 42 #include "private.h"
43 43  
44 44 #if GTK_CHECK_VERSION(3,0,0)
... ...
src/pw3270/v3270/mouse.c
  Diff comments   View file @29238cb
... ... @@ -30,7 +30,7 @@
30 30 #include <gtk/gtk.h>
31 31 #include <gdk/gdk.h>
32 32 #include <pw3270.h>
33   - #include <pw3270/v3270.h>
  33 + #include <v3270.h>
34 34 #include "private.h"
35 35 #include <lib3270/selection.h>
36 36 #include <lib3270/actions.h>
... ...
src/pw3270/v3270/oia.c
  Diff comments   View file @29238cb
... ... @@ -41,7 +41,7 @@
41 41 #include <math.h>
42 42 #endif // HAVE_LIBM
43 43  
44   - #include <pw3270/v3270.h>
  44 + #include <v3270.h>
45 45 #include "private.h"
46 46 #include "accessible.h"
47 47  
... ...
src/pw3270/v3270/private.h
  Diff comments   View file @29238cb
... ... @@ -36,7 +36,7 @@
36 36 #include <glib/gi18n.h>
37 37  
38 38 #ifndef V3270_H_INCLUDED
39   - #include <pw3270/v3270.h>
  39 + #include <v3270.h>
40 40 #endif
41 41  
42 42 G_BEGIN_DECLS
... ...
src/pw3270/v3270/properties.c
  Diff comments   View file @29238cb
... ... @@ -34,7 +34,7 @@
34 34 #include <lib3270/log.h>
35 35 #include <lib3270/macros.h>
36 36 #include <errno.h>
37   - #include <pw3270/v3270.h>
  37 + #include <v3270.h>
38 38 #include "private.h"
39 39  
40 40 /*--[ Globals ]--------------------------------------------------------------------------------------*/
... ...
src/pw3270/v3270/selection.c
  Diff comments   View file @29238cb
... ... @@ -29,7 +29,7 @@
29 29  
30 30 #include <gtk/gtk.h>
31 31 #include <pw3270.h>
32   - #include <pw3270/v3270.h>
  32 + #include <v3270.h>
33 33 #include "private.h"
34 34 #include <lib3270/selection.h>
35 35 #include <lib3270/log.h>
... ...
src/pw3270/v3270/widget.c
  Diff comments   View file @29238cb
... ... @@ -40,7 +40,7 @@
40 40 #include <malloc.h>
41 41 #endif // HAVE_MALLOC_H
42 42  
43   - #include <pw3270/v3270.h>
  43 + #include <v3270.h>
44 44 #include "private.h"
45 45 #include "accessible.h"
46 46 #include "marshal.h"
... ...
src/pw3270/v3270ft/Makefile.in
  Diff comments   View file @29238cb
... ... @@ -64,24 +64,23 @@ DOXYGEN=@DOXYGEN@
64 64 AMTAR=@AMTAR@
65 65 SHELL=@SHELL@
66 66 MKDIR=@MKDIR_P@
67   -GENMARSHAL=glib-genmarshal
  67 +GENMARSHAL=@GENMARSHAL@
68 68  
69 69 CC=@CC@
70 70 LD=@CC@
71 71 AR=@AR@
72 72  
73   -LIB3270_CFLAGS=@LIB3270_CFLAGS@
74   -LIB3270_LIBS=@LIB3270_LIBS@
75   -
76 73 GTK_CFLAGS=@GTK_CFLAGS@
77 74 GTK_LIBS=@GTK_LIBS@
78 75  
79 76 GLIB_CFLAGS=@GLIB_CFLAGS@
80 77 GLIB_LIBS=@GLIB_LIBS@
81 78  
82   -CFLAGS=@CFLAGS@ @DLL_CFLAGS@ \
83   - -I../include \
  79 +CFLAGS=@CFLAGS@ \
  80 + @DLL_CFLAGS@ \
84 81 -DBUILD_DATE=`date +"0x%Y%m%d"` \
  82 + @LIB3270_CFLAGS@ \
  83 + @PW3270_CFLAGS@ \
85 84 $(GTK_CFLAGS)
86 85  
87 86 LIBS=@LIBS@ $(GTK_LIBS)
... ...
src/pw3270/v3270ft/transfer.c
  Diff comments   View file @29238cb
... ... @@ -28,7 +28,7 @@
28 28 *
29 29 */
30 30  
31   - #include <pw3270/v3270.h>
  31 + #include <v3270.h>
32 32 #include "private.h"
33 33  
34 34  
... ...