Skip to content

Commit

Permalink
fixing typoe in HAS_ALLOCA_H_ macro command line flag
Browse files Browse the repository at this point in the history
  • Loading branch information
mattconnolly committed Apr 16, 2012
1 parent 8ab0eb8 commit de377e6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions ext/common/EventedMessageServer.h
Expand Up @@ -31,6 +31,8 @@
#include <cstdlib> #include <cstdlib>
#ifdef HAS_ALLOCA_H_ #ifdef HAS_ALLOCA_H_
#include <alloca.h> #include <alloca.h>
#else
#error "alloca is required."
#endif #endif
#include "EventedServer.h" #include "EventedServer.h"
#include "MessageReadersWriters.h" #include "MessageReadersWriters.h"
Expand Down
4 changes: 2 additions & 2 deletions lib/phusion_passenger/platform_info/compiler.rb
Expand Up @@ -145,7 +145,7 @@ def self.portability_cflags
flags << '-pthreads' flags << '-pthreads'
if RUBY_PLATFORM =~ /solaris2.11/ if RUBY_PLATFORM =~ /solaris2.11/
# skip the _XOPEN_SOURCE and _XPG4_2 definitions in later versions of Solaris / OpenIndiana # skip the _XOPEN_SOURCE and _XPG4_2 definitions in later versions of Solaris / OpenIndiana
flags << '-DHAS_ALLOCA_H_ -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64' flags << '-D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
else else
flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64' flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
flags << '-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED' if RUBY_PLATFORM =~ /solaris2.9/ flags << '-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED' if RUBY_PLATFORM =~ /solaris2.9/
Expand All @@ -163,7 +163,7 @@ def self.portability_cflags
flags << '-DBOOST_SP_USE_PTHREADS' flags << '-DBOOST_SP_USE_PTHREADS'
end end


flags << '-DHAS_ALLOCA_H' if has_alloca_h? flags << '-DHAS_ALLOCA_H_' if has_alloca_h?
flags << '-DHAS_SFENCE' if supports_sfence_instruction? flags << '-DHAS_SFENCE' if supports_sfence_instruction?
flags << '-DHAS_LFENCE' if supports_lfence_instruction? flags << '-DHAS_LFENCE' if supports_lfence_instruction?


Expand Down

0 comments on commit de377e6

Please sign in to comment.