Skip to content

Ts 4142 #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zwoop wants to merge 2 commits into from
Closed

Ts 4142 #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a252f3
TS-4142 Fixes builds on OmniOS, this is master only
zwoop Jan 17, 2016
713b435
TS-4142 Fixes builds on OmniOS
zwoop Jan 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/ts/ContFlags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ class ContFlags
enum flags { DEBUG_OVERRIDE = 0, DISABLE_PLUGINS = 1, LAST_FLAG };

ContFlags() : raw_flags(0) {}
ContFlags(u_int32_t in_flags) : raw_flags(in_flags) {}
ContFlags(uint32_t in_flags) : raw_flags(in_flags) {}
void
set_flags(u_int32_t new_flags)
set_flags(uint32_t new_flags)
{
raw_flags = new_flags;
}
Expand All @@ -55,7 +55,7 @@ class ContFlags
return *this;
}

u_int32_t
uint32_t
get_flags() const
{
return raw_flags;
Expand All @@ -81,7 +81,7 @@ class ContFlags
}

private:
u_int32_t raw_flags;
uint32_t raw_flags;
};

void init_cont_flags();
Expand Down
2 changes: 1 addition & 1 deletion lib/ts/ink_resource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class Resource
setName(const void *symbol, const char *name)
{
Dl_info info;
dladdr(symbol, &info);
dladdr(const_cast<void *>(symbol), &info);
snprintf(_name, sizeof(_name), "%s/%s", name, info.dli_sname);
}
const char *
Expand Down
26 changes: 13 additions & 13 deletions plugins/experimental/cachekey/configs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,19 +324,19 @@ Configs::loadClassifiers(const String &args, bool blacklist)
bool
Configs::init(int argc, char *argv[])
{
static const struct option longopt[] = {{"exclude-params", optional_argument, 0, 'a'},
{"include-params", optional_argument, 0, 'b'},
{"include-match-params", optional_argument, 0, 'c'},
{"exclude-match-params", optional_argument, 0, 'd'},
{"sort-params", optional_argument, 0, 'e'},
{"remove-all-params", optional_argument, 0, 'f'},
{"include-headers", optional_argument, 0, 'g'},
{"include-cookies", optional_argument, 0, 'h'},
{"ua-capture", optional_argument, 0, 'i'},
{"static-prefix", optional_argument, 0, 'j'},
{"capture-prefix", optional_argument, 0, 'k'},
{"ua-whitelist", optional_argument, 0, 'l'},
{"ua-blacklist", optional_argument, 0, 'm'},
static const struct option longopt[] = {{const_cast<char *>("exclude-params"), optional_argument, 0, 'a'},
{const_cast<char *>("include-params"), optional_argument, 0, 'b'},
{const_cast<char *>("include-match-params"), optional_argument, 0, 'c'},
{const_cast<char *>("exclude-match-params"), optional_argument, 0, 'd'},
{const_cast<char *>("sort-params"), optional_argument, 0, 'e'},
{const_cast<char *>("remove-all-params"), optional_argument, 0, 'f'},
{const_cast<char *>("include-headers"), optional_argument, 0, 'g'},
{const_cast<char *>("include-cookies"), optional_argument, 0, 'h'},
{const_cast<char *>("ua-capture"), optional_argument, 0, 'i'},
{const_cast<char *>("static-prefix"), optional_argument, 0, 'j'},
{const_cast<char *>("capture-prefix"), optional_argument, 0, 'k'},
{const_cast<char *>("ua-whitelist"), optional_argument, 0, 'l'},
{const_cast<char *>("ua-blacklist"), optional_argument, 0, 'm'},
{0, 0, 0, 0}};

bool status = true;
Expand Down
9 changes: 8 additions & 1 deletion plugins/experimental/cachekey/pattern.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@
#ifndef PLUGINS_EXPERIMENTAL_CACHEKEY_PATTERN_H_
#define PLUGINS_EXPERIMENTAL_CACHEKEY_PATTERN_H_

#include <pcre.h> /* pcre, pcre_extra, pcre_exec */
#include "ts/ink_defs.h"

#ifdef HAVE_PCRE_PCRE_H
#include <pcre/pcre.h>
#else
#include <pcre.h>
#endif

#include "common.h"

/**
Expand Down