diff options
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/llwindow/llwindowmacosx-objc.h | 5 | 
2 files changed, 6 insertions, 0 deletions
| diff --git a/doc/contributions.txt b/doc/contributions.txt index 0035d4f597..4e3ce70e0b 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1122,6 +1122,7 @@ Slee Mayo  snowy Sidran  Sovereign Engineer      MAINT-2334 +    OPEN-189  SpacedOut Frye  	VWR-34  	VWR-45 diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h index 32b3bfb078..3b6295fba8 100755 --- a/indra/llwindow/llwindowmacosx-objc.h +++ b/indra/llwindow/llwindowmacosx-objc.h @@ -25,6 +25,9 @@   * $/LicenseInfo$   */ +#ifndef LL_LLWINDOWMACOSX_OBJC_H +#define LL_LLWINDOWMACOSX_OBJC_H +  #include <map>  #include <vector> @@ -143,3 +146,5 @@ NSWindowRef getMainAppWindow();  GLViewRef getGLView();  unsigned int getModifiers(); + +#endif // LL_LLWINDOWMACOSX_OBJC_H | 
