Skip to content

Commit

Permalink
- fix for win64
Browse files Browse the repository at this point in the history
  • Loading branch information
jconway committed Oct 8, 2010
1 parent 876ca83 commit 020c324
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions pg_userfuncs.c
Expand Up @@ -34,7 +34,7 @@

extern MemoryContext plr_SPI_context;

#ifndef WIN32
#if !defined(WIN32) && !defined(WIN64)
extern char **environ;
#endif

Expand Down Expand Up @@ -284,7 +284,7 @@ plr_environ(PG_FUNCTION_ARGS)
char *var_name;
char *var_val;
char *values[2];
#ifndef WIN32
#if !defined(WIN32) && !defined(WIN64)
char **current_env;
#else
char *buf;
Expand Down Expand Up @@ -326,7 +326,7 @@ plr_environ(PG_FUNCTION_ARGS)
/* initialize our tuplestore */
tupstore = TUPLESTORE_BEGIN_HEAP;

#ifndef WIN32
#if !defined(WIN32) && !defined(WIN64)
for (current_env = environ;
current_env != NULL && *current_env != NULL;
current_env++)
Expand Down
2 changes: 1 addition & 1 deletion plr.c
Expand Up @@ -380,7 +380,7 @@ plr_init(void)
/* arrange for automatic cleanup at proc_exit */
on_proc_exit(plr_cleanup, 0);

#ifndef WIN32
#if !defined(WIN32) && !defined(WIN64)
/*
* Force non-interactive mode since R may not do so.
* See comment in Rembedded.c just after R_Interactive = TRUE:
Expand Down
2 changes: 1 addition & 1 deletion plr.h
Expand Up @@ -95,7 +95,7 @@
#if (R_VERSION >= 132096) /* R_VERSION >= 2.4.0 */
#include "Rembedded.h"
#endif
#ifndef WIN32
#if !defined(WIN32) && !defined(WIN64)
#include "Rinterface.h"
#endif
#include "Rinternals.h"
Expand Down

0 comments on commit 020c324

Please sign in to comment.