← Back to branch summary

~ubuntu-branches/debian/stretch/protobuf/stretch

« back to all changes in this revision

Viewing changes to src/google/protobuf/stubs/atomicops.h

  • Committer: Package Import Robot
  • Author(s): Robert Edmonds
  • Date: 2014-09-22 16:52:50 UTC
  • Revision ID: package-import@ubuntu.com-20140922165250-we74u013n3n11x41
Tags: 2.6.0-4
Merge post-2.6.0 fixes that were merged upstream. In particular,
protoc-generated code should now compile correctly when built with Clang.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/google/protobuf/stubs/atomicops.h
194
194
#include <google/protobuf/stubs/atomicops_internals_pnacl.h>
195
195
#elif (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4))
196
196
#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
 
197
#elif defined(__clang__)
 
198
#if __has_extension(c_atomic)
 
199
#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
 
200
#else
 
201
GOOGLE_PROTOBUF_ATOMICOPS_ERROR
 
202
#endif
197
203
#else
198
204
GOOGLE_PROTOBUF_ATOMICOPS_ERROR
199
205
#endif