Skip to content

Commit

Permalink
THRIFT-1128:MAC OS X thrift.h incompatibility with Thrift.h
Browse files Browse the repository at this point in the history
Client: cpp, c_glib
Patch: Jake Farrell

Moving c_glib headers into $(includedir)/thrift/c_glib to not collide with cpp headers.



git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1296038 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
jfarrell committed Mar 2, 2012
1 parent 6883950 commit 363f6d4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/c_glib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ libthrift_c_glib_la_SOURCES = src/thrift.c \

libthrift_c_glib_la_CFLAGS = $(common_cflags)

include_thriftdir = $(includedir)/thrift
include_thriftdir = $(includedir)/thrift/c_glib
include_thrift_HEADERS = \
$(top_builddir)/config.h \
src/thrift.h \
Expand Down

0 comments on commit 363f6d4

Please sign in to comment.