← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

Viewing changes to daemon/libs/pjproject/pjlib/include/pj/config.h

  • Committer: Package Import Robot
  • Author(s): Francois Marier
  • Date: 2012-02-18 21:47:09 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120218214709-6362d71gqdsdkrj5
Tags: 1.0.2-1
http://bugs.debian.org/658987
* New upstream release
  - remove logging patch (applied upstream)
  - update s390 patch since it was partially applied upstream
* Include the Evolution plugin as a separate binary package

* Fix compilation issues on SH4 (closes: #658987)
* Merge Ubuntu's binutils-gold linking fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/libs/pjproject/pjlib/include/pj/config.h
276
276
#   define PJ_HAS_PENTIUM       0
277
277
#   define PJ_IS_LITTLE_ENDIAN  1
278
278
#   define PJ_IS_BIG_ENDIAN     0
 
279
 
 
280
#elif defined(PJ_M_SH) || defined(__sh__) || defined(__sh) || \
 
281
        defined(__SH__) || defined(_ARCH_SH) || defined(_SH_)
 
282
    /*
 
283
     * Renesas SuperH, default to little endian
 
284
     */
 
285
#   undef PJ_M_SH
 
286
#   define PJ_M_SH              1
 
287
#   define PJ_M_NAME            "sh"
 
288
#   define PJ_HAS_PENTIUM       0
 
289
#   if !defined(PJ_IS_LITTLE_ENDIAN) && !defined(PJ_IS_BIG_ENDIAN)
 
290
#       define PJ_IS_LITTLE_ENDIAN      1
 
291
#       define PJ_IS_BIG_ENDIAN         0
 
292
#   endif
279
293
                
280
294
#else
281
295
#   error "Please specify target machine."