Remove redundant call to `msDebugInitFromEnv()` in `mapserv` #4522

Closed
wants to merge 3 commits into
from

Projects

None yet

4 participants

@homme
Contributor
homme commented Nov 12, 2012

msSetup() already calls msDebugInitFromEnv().

@homme homme Remove redundant call to `msDebugInitFromEnv()`
`msSetup()` already calls `msDebugInitFromEnv()`.
c8252fa
@mapserver-bot

Can one of the admins verify this patch?

@tbonfort
Member

@mapserver-bot ok to test

@homme homme Specify correct "C" linkage in `cgiutil.h`
`cgiutil.h` is the only file included by `mapserver.h` which defines
symbols and which isn't wrapped by `extern "C"`: its symbols end up in
`libmapserver` and without this fix linking against them in C++ fails.
a7bbed0
@homme
Contributor
homme commented Nov 12, 2012

I was going to action a separate pull request for the cgiutil.h change but it seems to have been automatically included here!
edit: just realised this is because I didn't read the following:

You can add more commits to this pull request by pushing to the master branch on homme/mapserver

@dmorissette
Contributor

Note that the comment above the call to msInitDebugFromFile() that you replaced in your patch needs to be either edited or removed since it loses its meaning with this change:

/* Use MS_ERRORFILE and MS_DEBUGLEVEL env vars if set */
@tbonfort tbonfort was assigned Nov 14, 2012
@tbonfort tbonfort added a commit that referenced this pull request Dec 11, 2012
@homme @tbonfort homme + tbonfort Remove redundant call to msDebugInitFromEnv (#4522)
`msSetup()` already calls `msDebugInitFromEnv()`.

Specify correct "C" linkage in `cgiutil.h`

`cgiutil.h` is the only file included by `mapserver.h` which defines
symbols and which isn't wrapped by `extern "C"`: its symbols end up in
`libmapserver` and without this fix linking against them in C++ fails.

closes #4522
5e3bc56
@tbonfort tbonfort added a commit that closed this pull request Dec 11, 2012
@homme @tbonfort homme + tbonfort Remove redundant call to msDebugInitFromEnv (#4522)
`msSetup()` already calls `msDebugInitFromEnv()`.

Specify correct "C" linkage in `cgiutil.h`

`cgiutil.h` is the only file included by `mapserver.h` which defines
symbols and which isn't wrapped by `extern "C"`: its symbols end up in
`libmapserver` and without this fix linking against them in C++ fails.

closes #4522
5e3bc56
@tbonfort tbonfort closed this in 5e3bc56 Dec 11, 2012
@mkofahl mkofahl pushed a commit to faegi/mapserver that referenced this pull request Apr 9, 2013
@homme @tbonfort homme + tbonfort Remove redundant call to msDebugInitFromEnv (#4522)
`msSetup()` already calls `msDebugInitFromEnv()`.

Specify correct "C" linkage in `cgiutil.h`

`cgiutil.h` is the only file included by `mapserver.h` which defines
symbols and which isn't wrapped by `extern "C"`: its symbols end up in
`libmapserver` and without this fix linking against them in C++ fails.

closes #4522
1615d41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment