Skip to content
Browse files

tons of still wrong line endings (I thought I had done earlier); furt…

…her "#endif macintosh" is not allowed by ANSI C

git-svn-id: https://svn.r-project.org/R/branches/R-1-2-Mac@12578 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 65e6761 commit d9ed7d8372775032a1b4962941ac58da6449e688 maechler committed
Showing with 172 additions and 42 deletions.
  1. +1 −1 src/appl/chisqsim.c
  2. +15 −16 src/appl/cpoly.c
  3. +1 −1 src/appl/fmin.c
  4. +1 −1 src/appl/lbfgsb.c
  5. +1 −1 src/appl/loglin.c
  6. +1 −1 src/appl/strsignif.c
  7. +1 −1 src/appl/uncmin.c
  8. +1 −1 src/appl/zeroin.c
  9. +1 −0 src/gnuwin32/bitmap/jconfig.h
  10. +1 −0 src/gnuwin32/bitmap/rbitmap.c
  11. +1 −0 src/gnuwin32/fixed/h/config.h
  12. +1 −0 src/gnuwin32/fixed/h/psignal.h
  13. +2 −1 src/gnuwin32/front-ends/SC_proxy.h
  14. +2 −1 src/gnuwin32/front-ends/bdx.c
  15. +2 −1 src/gnuwin32/front-ends/bdx.h
  16. +1 −0 src/gnuwin32/front-ends/rcmd.c
  17. +1 −0 src/gnuwin32/front-ends/rgui.c
  18. +2 −1 src/gnuwin32/front-ends/rproxy.c
  19. +2 −1 src/gnuwin32/front-ends/rproxy_impl.c
  20. +2 −1 src/gnuwin32/front-ends/rproxy_impl.h
  21. +1 −0 src/gnuwin32/front-ends/rterm.c
  22. +1 −0 src/gnuwin32/front-ends/rtest.c
  23. +1 −0 src/gnuwin32/getline/getline.c
  24. +1 −0 src/gnuwin32/getline/getline.h
  25. +1 −0 src/gnuwin32/getline/testgl.c
  26. +1 −0 src/gnuwin32/graphapp/arith.c
  27. +1 −0 src/gnuwin32/graphapp/array.c
  28. +1 −0 src/gnuwin32/graphapp/bitmaps.c
  29. +1 −0 src/gnuwin32/graphapp/buttons.c
  30. +1 −0 src/gnuwin32/graphapp/clipboard.c
  31. +1 −0 src/gnuwin32/graphapp/context.c
  32. +1 −0 src/gnuwin32/graphapp/controls.c
  33. +1 −0 src/gnuwin32/graphapp/cursors.c
  34. +1 −0 src/gnuwin32/graphapp/dialogs.c
  35. +1 −0 src/gnuwin32/graphapp/drawing.c
  36. +1 −0 src/gnuwin32/graphapp/drawtext.c
  37. +1 −0 src/gnuwin32/graphapp/events.c
  38. +1 −0 src/gnuwin32/graphapp/fonts.c
  39. +1 −0 src/gnuwin32/graphapp/ga.h
  40. +1 −0 src/gnuwin32/graphapp/gbuttons.c
  41. +1 −0 src/gnuwin32/graphapp/gdraw.c
  42. +1 −0 src/gnuwin32/graphapp/gif.c
  43. +1 −0 src/gnuwin32/graphapp/gimage.c
  44. +1 −0 src/gnuwin32/graphapp/gmenus.c
  45. +1 −0 src/gnuwin32/graphapp/graphapp.h
  46. +1 −0 src/gnuwin32/graphapp/graphappmain.c
  47. +1 −0 src/gnuwin32/graphapp/image.c
  48. +1 −0 src/gnuwin32/graphapp/init.c
  49. +1 −0 src/gnuwin32/graphapp/internal.h
  50. +1 −0 src/gnuwin32/graphapp/menus.c
  51. +1 −0 src/gnuwin32/graphapp/metafile.c
  52. +1 −0 src/gnuwin32/graphapp/objects.c
  53. +1 −0 src/gnuwin32/graphapp/printer.c
  54. +1 −0 src/gnuwin32/graphapp/rgb.c
  55. +1 −0 src/gnuwin32/graphapp/status.c
  56. +1 −0 src/gnuwin32/graphapp/stdimg.c
  57. +1 −0 src/gnuwin32/graphapp/stdimg.h
  58. +1 −0 src/gnuwin32/graphapp/str.h
  59. +1 −0 src/gnuwin32/graphapp/strings.c
  60. +1 −0 src/gnuwin32/graphapp/tooltips.c
  61. +1 −0 src/gnuwin32/graphapp/windows.c
  62. +1 −0 src/gnuwin32/graphapp/xredef.c
  63. +1 −0 src/gnuwin32/help/Rchtml.c
  64. +1 −0 src/gnuwin32/installer/dounzip.c
  65. +1 −0 src/gnuwin32/installer/rwinst.c
  66. +1 −0 src/gnuwin32/math/acosh.c
  67. +1 −0 src/gnuwin32/math/asinh.c
  68. +1 −0 src/gnuwin32/math/atanh.c
  69. +1 −0 src/gnuwin32/math/const.c
  70. +1 −0 src/gnuwin32/math/mconf.h
  71. +1 −0 src/gnuwin32/math/polevl.c
  72. +1 −0 src/gnuwin32/math/protos.h
  73. +1 −0 src/gnuwin32/unzip/structs.h
  74. +1 −0 src/gnuwin32/windlgs/src/ttest.c
  75. +1 −0 src/gnuwin32/xdr/rpc/auth.h
  76. +1 −0 src/gnuwin32/xdr/rpc/auth_uni.h
  77. +1 −0 src/gnuwin32/xdr/rpc/bcopy.h
  78. +1 −0 src/gnuwin32/xdr/rpc/clnt.h
  79. +1 −0 src/gnuwin32/xdr/rpc/netdb.h
  80. +1 −0 src/gnuwin32/xdr/rpc/rpc.h
  81. +1 −0 src/gnuwin32/xdr/rpc/rpc_msg.h
  82. +1 −0 src/gnuwin32/xdr/rpc/svc.h
  83. +1 −0 src/gnuwin32/xdr/rpc/svc_auth.h
  84. +1 −0 src/gnuwin32/xdr/rpc/types.h
  85. +1 −0 src/gnuwin32/xdr/rpc/xdr.h
  86. +1 −0 src/gnuwin32/xdr/xdr.c
  87. +1 −0 src/gnuwin32/xdr/xdr_float.c
  88. +1 −0 src/gnuwin32/xdr/xdr_stdio.c
  89. +2 −1 src/include/Graphics.h
  90. +1 −0 src/include/R_ext/Applic.h
  91. +1 −0 src/include/R_ext/Boolean.h
  92. +1 −0 src/include/R_ext/Complex.h
  93. +1 −0 src/include/R_ext/Constants.h
  94. +1 −0 src/include/R_ext/Error.h
  95. +1 −0 src/include/R_ext/Linpack.h
  96. +1 −0 src/include/R_ext/Mathlib.h
  97. +1 −0 src/include/R_ext/Memory.h
  98. +1 −0 src/include/R_ext/Print.h
  99. +1 −0 src/include/R_ext/PrtUtil.h
  100. +1 −0 src/include/R_ext/RS.h
  101. +1 −0 src/include/R_ext/Random.h
  102. +1 −0 src/include/R_ext/Utils.h
  103. +1 −0 src/include/R_ext/eventloop.h
  104. +1 −0 src/include/R_ext/f2c.h
  105. +1 −1 src/library/modreg/src/bsplvd.f
  106. +1 −1 src/main/Rregex.h
  107. +1 −1 src/main/Rstrptime.h
  108. +1 −1 src/main/alloca.c
  109. +3 −3 src/main/datetime.c
  110. +1 −1 src/main/dotcode.c
  111. +1 −1 src/main/optim.c
  112. +2 −2 src/main/platform.c
  113. +1 −1 src/main/regex.c
  114. +1 −0 src/unix/X11/dataentry.c
  115. +1 −0 src/unix/X11/devX11.c
  116. +1 −0 src/unix/X11/devX11.h
  117. +1 −0 src/unix/X11/rbitmap.c
  118. +1 −0 src/unix/X11/rotated.c
  119. +1 −0 src/unix/X11/rotated.h
  120. +1 −0 src/unix/gnome/command-grep.c
  121. +1 −0 src/unix/gnome/command-grep.h
  122. +1 −0 src/unix/gnome/devGNOME.c
  123. +1 −0 src/unix/gnome/devGNOME.h
  124. +1 −0 src/unix/gnome/devGTK.c
  125. +1 −0 src/unix/gnome/devGTK.h
  126. +1 −0 src/unix/gnome/gdkrotated.c
  127. +1 −0 src/unix/gnome/gdkrotated.h
  128. +1 −0 src/unix/gnome/gnome-find-dialog.c
  129. +1 −0 src/unix/gnome/gnome-find-dialog.h
  130. +1 −0 src/unix/gnome/gtkconsole.c
  131. +1 −0 src/unix/gnome/gtkconsole.h
  132. +1 −0 src/unix/gnome/savehistory.c
  133. +1 −0 src/unix/gnome/system-choosefile.c
  134. +1 −0 src/unix/gnome/system-console.c
  135. +1 −0 src/unix/gnome/system-showfiles.c
  136. +1 −0 src/unix/gnome/system.c
  137. +1 −0 src/unix/gnome/terminal-find.c
  138. +1 −0 src/unix/gnome/terminal-find.h
  139. +1 −0 src/unix/gnome/terminal-functions.c
  140. +1 −0 src/unix/gnome/terminal-functions.h
  141. +1 −0 src/unix/gnome/terminal-menu.c
  142. +1 −0 src/unix/gnome/terminal-menu.h
  143. +1 −0 src/unix/gnome/terminal-prefs.c
  144. +1 −0 src/unix/gnome/terminal-prefs.h
  145. +1 −0 src/unix/gnome/terminal-toolbar.c
  146. +1 −0 src/unix/gnome/terminal-toolbar.h
  147. +1 −0 src/unix/gnome/terminal.c
  148. +1 −0 src/unix/gnome/terminal.h
View
2 src/appl/chisqsim.c
@@ -7,7 +7,7 @@
#include <math.h>
#else
#include <fp.h>
-#endif macintosh
+#endif
#include "R_ext/Random.h"
#include "R_ext/Applic.h"
View
31 src/appl/cpoly.c
@@ -115,7 +115,7 @@ static const double eta = DBL_EPSILON;
static const double are = /* eta = */DBL_EPSILON;
static const double mre = 2. * M_SQRT2 * /* eta, i.e. */DBL_EPSILON;
static const double infin = DBL_MAX;
-#endif macintosh
+#endif /* mac */
void R_cpolyroot(double *opr, double *opi, int *degree,
double *zeror, double *zeroi, Rboolean *fail)
{
@@ -123,7 +123,7 @@ void R_cpolyroot(double *opr, double *opi, int *degree,
static const double smalno = 1.1920929E-07;
#else
static const double smalno = DBL_MIN;
-#endif macintosh
+#endif /* mac */
static const double base = (double)FLT_RADIX;
static int d_n, i, i1, i2;
static double zi, zr, xx, yy;
@@ -176,7 +176,7 @@ void R_cpolyroot(double *opr, double *opi, int *degree,
#else
mac_pi[i] = opi[i];
shr[i] = hypot(pr[i], mac_pi[i]);
-#endif macintosh
+#endif /* mac */
}
/* scale the polynomial with factor 'bnd'. */
@@ -188,7 +188,7 @@ void R_cpolyroot(double *opr, double *opi, int *degree,
pi[i] *= bnd;
#else
mac_pi[i] *= bnd;
-#endif macintosh
+#endif /* mac */
}
}
@@ -203,7 +203,7 @@ void R_cpolyroot(double *opr, double *opi, int *degree,
shr[i] = hypot(pr[i], pi[i]);
#else
shr[i] = hypot(pr[i], mac_pi[i]);
-#endif macintosh
+#endif /* mac */
bnd = cpoly_cauchy(nn, shr, shi);
/* outer loop to control 2 major passes */
@@ -256,7 +256,7 @@ void R_cpolyroot(double *opr, double *opi, int *degree,
pi[i] = qpi[i];
#else
mac_pi[i] = qpi[i];
-#endif macintosh
+#endif /* mac */
}
}/*while*/
@@ -265,7 +265,7 @@ void R_cpolyroot(double *opr, double *opi, int *degree,
cdivid(-pr[1], -pi[1], pr[0], pi[0], &zeror[d1], &zeroi[d1]);
#else
cdivid(-pr[1], -mac_pi[1], pr[0], mac_pi[0], &zeror[d1], &zeroi[d1]);
-#endif macintosh
+#endif /* mac */
return;
}
@@ -286,7 +286,7 @@ static void noshft(int l1)
hi[i] = xni * pi[i] / n;
#else
hi[i] = xni * mac_pi[i] / n;
-#endif macintosh
+#endif /* mac */
}
for (jj = 1; jj <= l1; jj++) {
@@ -313,7 +313,7 @@ static void noshft(int l1)
cdivid(-pr[nn-1], -pi[nn-1], hr[n-1], hi[n-1], &tr, &ti);
#else
cdivid(-pr[nn-1], -mac_pi[nn-1], hr[n-1], hi[n-1], &tr, &ti);
-#endif macintosh
+#endif /* mac */
for (i = 1; i <= nm1; i++) {
j = nn - i;
t1 = hr[j-2];
@@ -329,7 +329,7 @@ static void noshft(int l1)
}
hr[0] = pr[0];
hi[0] = mac_pi[0];
-#endif macintosh
+#endif /* mac */
}
}
}
@@ -363,7 +363,7 @@ static Rboolean fxshft(int l2, double *zr, double *zi)
pr, pi, qpr, qpi, &pvr, &pvi);
#else
pr, mac_pi, qpr, qpi, &pvr, &pvi);
-#endif macintosh
+#endif /* mac */
test = TRUE;
pasd = FALSE;
@@ -428,7 +428,7 @@ static Rboolean fxshft(int l2, double *zr, double *zi)
polyev(nn, sr, si, pr, pi, qpr, qpi, &pvr, &pvi);
#else
polyev(nn, sr, si, pr, mac_pi, qpr, qpi, &pvr, &pvi);
-#endif macintosh
+#endif /* mac */
calct(&bool);
}
}
@@ -467,15 +467,14 @@ static Rboolean vrshft(int l3, double *zr, double *zi)
for (i = 1; i <= l3; i++) {
/* evaluate p at s and test for convergence. */
-#ifndef macintosh
polyev(nn, sr, si,
+#ifndef macintosh
pr, pi, qpr, qpi,
- &pvr, &pvi);
#else
- polyev(nn, sr, si,
pr, mac_pi, qpr, qpi,
+#endif
&pvr, &pvi);
-#endif macintosh
+
mp = hypot(pvr, pvi);
ms = hypot(sr, si);
if (mp <= 20. * errev(nn, qpr, qpi, ms, mp, /*are=*/eta, mre)) {
View
2 src/appl/fmin.c
@@ -45,7 +45,7 @@
#include <math.h>
#else
#include <fp.h>
-#endif macintosh
+#endif /* mac */
#define MATHLIB_PRIVATE
#include <Rmath.h> /* for dimach */
#undef MATHLIB_PRIVATE
View
2 src/appl/lbfgsb.c
@@ -26,7 +26,7 @@
#include <math.h>
#else
#include <fp.h>
-#endif macintosh
+#endif /* mac */
#include <string.h>
#include <R.h> /* for F77_CALL */
#include <R_ext/Linpack.h>
View
2 src/appl/loglin.c
@@ -13,7 +13,7 @@
#include <math.h>
#else
#include <fp.h>
-#endif macintosh
+#endif /* mac */
#include <stdio.h>
#include "R_ext/RS.h"
View
2 src/appl/strsignif.c
@@ -67,7 +67,7 @@
#include <math.h>
#else
#include <fp.h>
-#endif macintosh
+#endif /* mac */
#include "R_ext/Error.h" /* error */
#include "R_ext/RS.h" /* Calloc */
View
2 src/appl/uncmin.c
@@ -27,7 +27,7 @@
#include <math.h>
#else
#include <fp.h>
-#endif macintosh
+#endif /* mac */
#include <R.h>
#include <R_ext/Applic.h>
#include <R_ext/PrtUtil.h> /* printRealVector */
View
2 src/appl/zeroin.c
@@ -77,7 +77,7 @@
#include <math.h>
#else
#include <fp.h>
-#endif macintosh
+#endif /* mac */
#define EPSILON DBL_EPSILON
View
1 src/gnuwin32/bitmap/jconfig.h
@@ -47,3 +47,4 @@
+
View
1 src/gnuwin32/bitmap/rbitmap.c
@@ -479,3 +479,4 @@ int R_SaveAsBmp(void *d, int width, int height,
+
View
1 src/gnuwin32/fixed/h/config.h
@@ -375,3 +375,4 @@ extern int _finite(double);
#define NONAMELESSUNION
#endif
+
View
1 src/gnuwin32/fixed/h/psignal.h
@@ -170,3 +170,4 @@ int sigsuspend(sigset_t* sigset_Info);
#endif /* Not RC_INVOKED */
#endif /* Not _PSIGNAL_H_ */
+
View
3 src/gnuwin32/front-ends/SC_proxy.h
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA
*
- * $Id: SC_proxy.h,v 1.3 1999/12/11 20:57:35 pd Exp $
+ * $Id: SC_proxy.h,v 1.3.18.1 2001/01/24 17:46:48 maechler Exp $
*/
#ifndef _STATCONN_H_
@@ -258,3 +258,4 @@ typedef int (SYSCALL* SC_PROXY_GET_OBJECT) (SC_Proxy_Object**,unsigned long);
#define SC_PROXY_GET_OBJECT_FUN "SC_Proxy_get_object@8"
#endif
+
View
3 src/gnuwin32/front-ends/bdx.c
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA
*
- * $Id: bdx.c,v 1.4 1999/12/15 17:20:28 pd Exp $
+ * $Id: bdx.c,v 1.4.16.1 2001/01/24 17:46:48 maechler Exp $
*/
#include <stdlib.h>
@@ -64,3 +64,4 @@ void bdx_free (BDX_Data* data)
free (data->dimensions);
free (data);
}
+
View
3 src/gnuwin32/front-ends/bdx.h
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA
*
- * $Id: bdx.h,v 1.4 1999/12/15 17:20:28 pd Exp $
+ * $Id: bdx.h,v 1.4.16.1 2001/01/24 17:46:48 maechler Exp $
*/
#ifndef _BDX_H_
@@ -250,3 +250,4 @@ typedef struct _BDX_Array_Specification
#endif
#endif
+
View
1 src/gnuwin32/front-ends/rcmd.c
@@ -88,3 +88,4 @@ int main (int argc, char **argv)
}
exit(status);
}
+
View
1 src/gnuwin32/front-ends/rgui.c
@@ -53,3 +53,4 @@ int AppMain (int argc, char **argv)
/* NOTREACHED */
return 0;
}
+
View
3 src/gnuwin32/front-ends/rproxy.c
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA
*
- * $Id: rproxy.c,v 1.6 2000/04/24 08:48:48 ripley Exp $
+ * $Id: rproxy.c,v 1.6.12.1 2001/01/24 17:46:48 maechler Exp $
*/
#define NONAMELESSUNION
@@ -463,3 +463,4 @@ int SYSCALL EXPORT SC_Proxy_get_object (SC_Proxy_Object** obj,
return SC_PROXY_OK;
}
+
View
3 src/gnuwin32/front-ends/rproxy_impl.c
@@ -21,7 +21,7 @@
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA
*
- * $Id: rproxy_impl.c,v 1.11 2000/09/22 14:28:57 maechler Exp $
+ * $Id: rproxy_impl.c,v 1.11.6.1 2001/01/24 17:46:48 maechler Exp $
*/
#define NONAMELESSUNION
@@ -716,3 +716,4 @@ int R_Proxy_term ()
return SC_PROXY_OK;
}
+
View
3 src/gnuwin32/front-ends/rproxy_impl.h
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA
*
- * $Id: rproxy_impl.h,v 1.4 1999/12/15 17:20:28 pd Exp $
+ * $Id: rproxy_impl.h,v 1.4.16.1 2001/01/24 17:46:48 maechler Exp $
*/
#ifndef _RPROXY_IMPL_H_
@@ -35,3 +35,4 @@ int R_Proxy_set_symbol (char const* pSymbol,BDX_Data const* pData);
int R_Proxy_term ();
#endif
+
View
1 src/gnuwin32/front-ends/rterm.c
@@ -80,3 +80,4 @@ int AppMain (int argc, char **argv)
/* NOTREACHED */
return 0;
}
+
View
1 src/gnuwin32/front-ends/rtest.c
@@ -157,3 +157,4 @@ int main (int argc, char **argv)
end_Rmainloop();
return 0;
}
+
View
1 src/gnuwin32/getline/getline.c
@@ -1358,3 +1358,4 @@ gl_beep(void)
gl_putc('\007');
#endif
} /* gl_beep */
+
View
1 src/gnuwin32/getline/getline.h
@@ -50,3 +50,4 @@ extern int (*gl_tab_hook)();
#endif /* __STDC__ */
#endif /* GETLINE_H */
+
View
1 src/gnuwin32/getline/testgl.c
@@ -16,3 +16,4 @@ main()
fputs(p, stdout);
} while (*p != 0);
}
+
View
1 src/gnuwin32/graphapp/arith.c
@@ -284,3 +284,4 @@ rect rcanon(rect r)
}
return r;
}
+
View
1 src/gnuwin32/graphapp/array.c
@@ -175,3 +175,4 @@ char * memjoin(char *a, char *b)
+
View
1 src/gnuwin32/graphapp/bitmaps.c
@@ -397,3 +397,4 @@ bitmap createbitmap(int width, int height, int depth, unsigned char *data)
return obj;
}
+
View
1 src/gnuwin32/graphapp/buttons.c
@@ -1326,3 +1326,4 @@ void handle_control(HWND hwnd, UINT message)
/* activate the control's callback */
activatecontrol(obj);
}
+
View
1 src/gnuwin32/graphapp/clipboard.c
@@ -104,3 +104,4 @@ int clipboardhastext()
{
return (int) IsClipboardFormatAvailable(CF_TEXT);
}
+
View
1 src/gnuwin32/graphapp/context.c
@@ -510,3 +510,4 @@ font currentfont(void) { return current->fnt; }
cursor currentcursor(void) { return current->crsr; }
int getkeystate(void) { return keystate; }
+
View
1 src/gnuwin32/graphapp/controls.c
@@ -884,3 +884,4 @@ void delobj(object obj)
break;
}
}
+
View
1 src/gnuwin32/graphapp/cursors.c
@@ -336,3 +336,4 @@ void init_cursors(void)
setcursor(ArrowCursor);
}
+
View
1 src/gnuwin32/graphapp/dialogs.c
@@ -495,3 +495,4 @@ char *askpassword(char *question, char *default_str)
return get_dialog_string(win);
}
+
View
1 src/gnuwin32/graphapp/drawing.c
@@ -682,3 +682,4 @@ void drawimage(image img, rect dr, rect sr)
if (i != img)
del(i);
}
+
View
1 src/gnuwin32/graphapp/drawtext.c
@@ -372,3 +372,4 @@ int gprintf(char *fmt, ...)
return count;
}
+
View
1 src/gnuwin32/graphapp/events.c
@@ -949,3 +949,4 @@ void finish_events(void)
settimer(0);
setmousetimer(0);
}
+
View
1 src/gnuwin32/graphapp/fonts.c
@@ -191,3 +191,4 @@ int fontwidth(font obj) { return obj->rect.width; }
int fontheight(font obj) { return obj->rect.height; }
int fontascent(font obj) { return obj->rect.x; }
int fontdescent(font obj) { return obj->rect.y; }
+
View
1 src/gnuwin32/graphapp/ga.h
@@ -183,3 +183,4 @@ void remove_menu_item(menuitem obj);
#endif /* __GA__VERSION */
+
View
1 src/gnuwin32/graphapp/gbuttons.c
@@ -118,3 +118,4 @@ int ggetkeystate()
}
+
View
1 src/gnuwin32/graphapp/gdraw.c
@@ -653,3 +653,4 @@ void BringToTop(window c)
/* SetForegroundWindow(c->handle); in 1.2.0/1 */
BringWindowToTop(c->handle);
}
+
View
1 src/gnuwin32/graphapp/gif.c
@@ -11,3 +11,4 @@ void save_gif(image img, char *filename)
{
}
+
View
1 src/gnuwin32/graphapp/gimage.c
@@ -168,3 +168,4 @@ image bitmaptoimage (drawing dw)
+
View
1 src/gnuwin32/graphapp/gmenus.c
@@ -140,3 +140,4 @@ popup gpopup(actionfn fn,MenuItem a[]) {
+
View
1 src/gnuwin32/graphapp/graphapp.h
@@ -771,3 +771,4 @@ inline int operator != (rect r1, rect r2) {return !equalr(r1,r2);}
#endif /* end C++ declarations */
#endif /* Common cross-platform graphics library. */
+
View
1 src/gnuwin32/graphapp/graphappmain.c
@@ -78,3 +78,4 @@ WinMain (HINSTANCE Instance, HINSTANCE PrevInstance, LPSTR CmdLine,
return 0;
}
+
View
1 src/gnuwin32/graphapp/image.c
@@ -1184,3 +1184,4 @@ void drawbrighter(image src, rect dr, rect sr)
src->cmap = oldcmap;
discard(newcmap);
}
+
View
1 src/gnuwin32/graphapp/init.c
@@ -187,3 +187,4 @@ void startgraphapp(HINSTANCE Instance, HINSTANCE PrevInstance, int CmdShow)
getappname(Instance);
}
+
View
1 src/gnuwin32/graphapp/internal.h
@@ -430,3 +430,4 @@ struct callinfo
#endif
#endif /* GraphApp internal header file */
+
View
1 src/gnuwin32/graphapp/menus.c
@@ -440,3 +440,4 @@ void handle_menu_key(WPARAM wParam)
activatecontrol(obj);
}
}
+
View
1 src/gnuwin32/graphapp/metafile.c
@@ -114,3 +114,4 @@ metafile newmetafile(char *name, double width, double height)
settext(obj, name ? name : "");
return obj;
}
+
View
1 src/gnuwin32/graphapp/objects.c
@@ -603,3 +603,4 @@ void remove_menu_item(object obj)
remove_object(obj);
remove_deleted_object(obj);
}
+
View
1 src/gnuwin32/graphapp/printer.c
@@ -155,3 +155,4 @@ void nextpage(printer p)
StartPage((HDC) p->handle);
Rwin_fpset();
}
+
View
1 src/gnuwin32/graphapp/rgb.c
@@ -1416,3 +1416,4 @@ rgb dialog_bg()
return myGetSysColor(COLOR_BTNFACE);
}
+
View
1 src/gnuwin32/graphapp/status.c
@@ -73,3 +73,4 @@ void setstatus(char *text) {
+
View
1 src/gnuwin32/graphapp/stdimg.c
@@ -1401,3 +1401,4 @@ static imagedata stop_imagedata = {
};
image stop_image = & stop_imagedata;
+
View
1 src/gnuwin32/graphapp/stdimg.h
@@ -15,3 +15,4 @@ extern image paste1_image;
extern image print_image;
extern image save_image;
extern image stop_image;
+
View
1 src/gnuwin32/graphapp/str.h
@@ -145,3 +145,4 @@ inline int operator != (int ch, string s2)
* End of string class definition.
*/
#endif
+
View
1 src/gnuwin32/graphapp/strings.c
@@ -263,3 +263,4 @@ char *to_c_string(char *text)
return newstr;
}
+
View
1 src/gnuwin32/graphapp/tooltips.c
@@ -57,3 +57,4 @@ int addtooltip(control c,char *tp) {
+
View
1 src/gnuwin32/graphapp/windows.c
@@ -670,3 +670,4 @@ int ismdi() {
return (hwndClient!=NULL);
}
+
View
1 src/gnuwin32/graphapp/xredef.c
@@ -88,3 +88,4 @@ window newwindow(char *name, rect r, long flags)
#endif
+
View
1 src/gnuwin32/help/Rchtml.c
@@ -23,3 +23,4 @@ __declspec(dllexport) void Rchtml(char **file, char **ptopic, int *error)
rc = HtmlHelp(GetDesktopWindow(), htmlref, HH_DISPLAY_TOPIC, 0);
*error = (rc == (HWND)NULL);
}
+
View
1 src/gnuwin32/installer/dounzip.c
@@ -93,3 +93,4 @@ int do_unzip(char *zipname, char *dest, int nfiles, char **files,
return 0;
}
+
View
1 src/gnuwin32/installer/rwinst.c
@@ -1122,3 +1122,4 @@ int main(void)
gamainloop();
return 0;
}
+
View
1 src/gnuwin32/math/acosh.c
@@ -160,3 +160,4 @@ if( z < 0.5 )
a = sqrt( z*(x+1.0) );
return( log(x + a) );
}
+
View
1 src/gnuwin32/math/asinh.c
@@ -158,3 +158,4 @@ if( x < 0.5 )
a = sqrt( z + 1.0 );
return( sign * log(x + a) );
}
+
View
1 src/gnuwin32/math/atanh.c
@@ -149,3 +149,4 @@ if( z < 0.5 )
return( 0.5 * log((1.0+x)/(1.0-x)) );
}
+
View
1 src/gnuwin32/math/const.c
@@ -250,3 +250,4 @@ extern unsigned short INFINITY[];
extern unsigned short NAN[];
extern unsigned short NEGZERO[];
#endif
+
View
1 src/gnuwin32/math/mconf.h
@@ -167,3 +167,4 @@ int mtherr();
/* Variable for error reporting. See mtherr.c. */
extern int merror;
+
View
1 src/gnuwin32/math/polevl.c
@@ -95,3 +95,4 @@ while( --i );
return( ans );
}
+
View
1 src/gnuwin32/math/protos.h
@@ -178,3 +178,4 @@ extern void polatn ( double num[], double den[], double ans[], int nn );
extern void polsqt ( double pol[], double ans[], int nn );
extern void polsin ( double x[], double y[], int nn );
extern void polcos ( double x[], double y[], int nn );
+
View
1 src/gnuwin32/unzip/structs.h
@@ -74,3 +74,4 @@ LPSTR lpszExtractDir;
} DCL, far * LPDCL;
#endif /* __structs_h */
+
View
1 src/gnuwin32/windlgs/src/ttest.c
@@ -174,3 +174,4 @@ SEXP menu_ttest3()
UNPROTECT(2);
return ans;
}
+
View
1 src/gnuwin32/xdr/rpc/auth.h
@@ -188,3 +188,4 @@ extern AUTH *authdes_create();
#endif /* __AUTH_HEADER__ */
+
View
1 src/gnuwin32/xdr/rpc/auth_uni.h
@@ -87,3 +87,4 @@ struct short_hand_verf {
#endif /* __AUTH_UNIX_HEADER__ */
+
View
1 src/gnuwin32/xdr/rpc/bcopy.h
@@ -13,3 +13,4 @@ void bcopy_fn(char *,char *,int);
void bcopy_ff(char *,char *,int);
void bzero(char*,int);
int bcmp(char *,char *,int);
+
View
1 src/gnuwin32/xdr/rpc/clnt.h
@@ -340,3 +340,4 @@ char *clnt_sperrno(/* enum clnt_stat num */); /* string */
#define RPCSMALLMSGSIZE 400 /* a more reasonable packet size */
#endif /*!_CLNT_*/
+
View
1 src/gnuwin32/xdr/rpc/netdb.h
@@ -49,3 +49,4 @@ struct rpcent {
};
struct rpcent *getrpcbyname(), *getrpcbynumber(), *getrpcent();
+
View
1 src/gnuwin32/xdr/rpc/rpc.h
@@ -133,3 +133,4 @@ extern int xdr_opaque_auth();
#include <rpc/netdb.h> /* structures and routines to parse /etc/rpc */
#endif /* ndef __RPC_HEADER__ */
+
View
1 src/gnuwin32/xdr/rpc/rpc_msg.h
@@ -202,3 +202,4 @@ extern void _seterr_reply();
#endif /* __RPC_MSG_HEADER__ */
+
View
1 src/gnuwin32/xdr/rpc/svc.h
@@ -289,3 +289,4 @@ extern SVCXPRT *svctcp_create();
#endif /* __SVC_HEADER__ */
+
View
1 src/gnuwin32/xdr/rpc/svc_auth.h
@@ -51,3 +51,4 @@
* Server side authenticator
*/
extern enum auth_stat _authenticate();
+
View
1 src/gnuwin32/xdr/rpc/types.h
@@ -87,3 +87,4 @@ typedef unsigned short u_short;
#endif
#endif /* ndef __TYPES_RPC_HEADER__ */
+
View
1 src/gnuwin32/xdr/rpc/xdr.h
@@ -279,3 +279,4 @@ extern bool_t xdrrec_skiprecord(); /* move to beginning of next record */
extern bool_t xdrrec_eof(); /* true if no more input */
#endif /* __XDR_HEADER__ */
+
View
1 src/gnuwin32/xdr/xdr.c
@@ -587,3 +587,4 @@ xdr_wrapstring(xdrs, cpp)
}
return (FALSE);
}
+
View
1 src/gnuwin32/xdr/xdr_float.c
@@ -296,3 +296,4 @@ xdr_double(xdrs, dp)
}
return (FALSE);
}
+
View
1 src/gnuwin32/xdr/xdr_stdio.c
@@ -227,3 +227,4 @@ xdrstdio_inline(xdrs, len)
*/
return (NULL);
}
+
View
3 src/include/Graphics.h
@@ -25,9 +25,10 @@
#include <R_ext/Boolean.h>
+/* WHY the following ?? */
#ifdef macintosh
#include <Rinternals.h>
-#endif macintosh
+#endif
#define R_MaxDevices 64
View
1 src/include/R_ext/Applic.h
@@ -277,3 +277,4 @@ void loglin(int *nvar, int *dim, int *ncon, int *config, int *ntab,
#endif
#endif /* R_APPLIC_H_ */
+
View
1 src/include/R_ext/Boolean.h
@@ -33,3 +33,4 @@ typedef enum { FALSE = 0, TRUE /*, MAYBE */ } Rboolean;
#endif
#endif /* R_EXT_BOOLEAN_H_ */
+
View
1 src/include/R_ext/Complex.h
@@ -35,3 +35,4 @@ typedef struct {
#endif
#endif /* R_COMPLEX_H */
+
View
1 src/include/R_ext/Constants.h
@@ -36,3 +36,4 @@
#define DOUBLE_XMIN DBL_MIN
#endif
+
View
1 src/include/R_ext/Error.h
@@ -40,3 +40,4 @@ void UNIMPLEMENTED(char *);
#endif
#endif /* _R_ERROR_H_ */
+
View
1 src/include/R_ext/Linpack.h
@@ -92,3 +92,4 @@ extern int F77_NAME(dspsl)(double*, int*, int*, double*);
#endif
#endif /* R_LINPACK_H_ */
+
View
1 src/include/R_ext/Mathlib.h
@@ -22,3 +22,4 @@
#include <Rmath.h>
#endif /* MATHLIB_H */
+
View
1 src/include/R_ext/Memory.h
@@ -46,3 +46,4 @@ void C_free(char *);
#endif
#endif /* R_EXT_MEMORY_H_ */
+
View
1 src/include/R_ext/Print.h
@@ -36,3 +36,4 @@ void REvprintf(const char*, va_list);
#endif
#endif /* R_EXT_PRINT_H_ */
+
View
1 src/include/R_ext/PrtUtil.h
@@ -81,3 +81,4 @@ char *Rsprintf(char*, ...);
#endif
#endif /* PRTUTIL_H_ */
+
View
1 src/include/R_ext/RS.h
@@ -75,3 +75,4 @@ void call_R(char*, long, void**, char**, long*, char**, long, char**);
#endif
#endif /* R_RS_H */
+
View
1 src/include/R_ext/Random.h
@@ -64,3 +64,4 @@ double * user_norm_rand();
#endif
#endif /* R_RANDOM_H */
+
View
1 src/include/R_ext/Utils.h
@@ -74,3 +74,4 @@ void hsv2rgb(double *h, double *s, double *v,/* in */
#endif
#endif /* R_EXT_UTILS_H_ */
+
View
1 src/include/R_ext/eventloop.h
@@ -52,3 +52,4 @@ extern int R_wait_usec;
#endif
#endif /* R_EXT_EVENTLOOP_H */
+
View
1 src/include/R_ext/f2c.h
@@ -226,3 +226,4 @@ typedef doublereal E_f; /* real function with -R not specified */
#undef vax
#endif
#endif
+
View
2 src/library/modreg/src/bsplvd.f
@@ -196,8 +196,8 @@ subroutine bsplvb ( t, lent,jhigh, index, x, left, biatx )
integer i,j,jp1
double precision deltal(jmax), deltar(jmax),saved,term
+ save j,deltal,deltar
data j/1/
- save j,deltal,deltar !(valid in fortran 77)
c
go to (10,20), index
10 j = 1
View
2 src/main/Rregex.h
@@ -39,7 +39,7 @@ extern "C" {
#ifdef macintosh
# include <stddef.h>
-#endif macintosh
+#endif /* mac */
/* The following two types have to be signed and unsigned integer type
wide enough to hold a value of a pointer. For most ANSI compilers
View
2 src/main/Rstrptime.h
@@ -49,7 +49,7 @@ static void get_locale_strings(void);
#else
# define match_string(cs1, s2) \
(strncmp ((cs1), (s2), strlen (cs1)) ? 0 : ((s2) += strlen (cs1), 1))
-#endif macintosh
+#endif /* mac */
/* We intentionally do not use isdigit() for testing because this will
lead to problems with the wide character version. */
View
2 src/main/alloca.c
@@ -82,7 +82,7 @@ typedef char *pointer;
# ifndef emacs
#ifndef macintosh
# define malloc xmalloc
-#endif macintosh
+#endif /* mac */
# endif
extern pointer malloc ();
View
6 src/main/datetime.c
@@ -312,7 +312,7 @@ SEXP do_systime(SEXP call, SEXP op, SEXP args, SEXP env)
extern char *tzname[2];
#else
char *tzname[2];
-#endif macintosh
+#endif /* mac */
#endif
static char buff[20]; /* for putenv */
@@ -379,7 +379,7 @@ SEXP do_asPOSIXlt(SEXP call, SEXP op, SEXP args, SEXP env)
#endif
#ifndef macintosh
tzset();
-#endif macintosh
+#endif /* mac */
}
n = LENGTH(x);
@@ -478,7 +478,7 @@ SEXP do_asPOSIXct(SEXP call, SEXP op, SEXP args, SEXP env)
#endif
#ifndef macintosh
tzset();
-#endif macintosh
+#endif /* mac */
}
for(i = 0; i < 6; i++)
View
2 src/main/dotcode.c
@@ -31,7 +31,7 @@
#ifdef macintosh
#include "Graphics.h"
-#endif macintosh
+#endif /* mac */
#ifndef max
#define max(a, b) ((a > b)?(a):(b))
View
2 src/main/optim.c
@@ -21,7 +21,7 @@
#include <math.h>
#else
#include <fp.h>
-#endif macintosh
+#endif /* mac */
#include "Defn.h"
#include <Rdefines.h> /* for CREATE_STRING_VECTOR */
View
4 src/main/platform.c
@@ -289,7 +289,7 @@ SEXP do_fileremove(SEXP call, SEXP op, SEXP args, SEXP rho)
#else
#include <types.h>
#include "dirent.h"
-#endif macintosh
+#endif /* mac */
#if HAVE_DIRENT_H
# include <dirent.h>
@@ -534,7 +534,7 @@ SEXP do_filechoose(SEXP call, SEXP op, SEXP args, SEXP rho)
#else
#include <types.h>
#include <stat.h>
-#endif macintosh
+#endif /* mac */
#if defined(Unix) && defined(HAVE_PWD_H) && defined(HAVE_GRP_H) \
&& defined(HAVE_GETPWUID) && defined(HAVE_GETGRGID)
View
2 src/main/regex.c
@@ -51,7 +51,7 @@
#include <types.h>
#else
#include <sys/types.h>
- #endif macintosh
+ #endif /* mac */
#endif
#define WIDE_CHAR_SUPPORT (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC)
View
1 src/unix/X11/dataentry.c
@@ -1697,3 +1697,4 @@ static void pastecell(int row, int col)
closerect();
highlightrect();
}
+
View
1 src/unix/X11/devX11.c
@@ -2072,3 +2072,4 @@ Rboolean R_GetX11Image(int d, XImage **pximage, int *pwidth, int *pheight)
return TRUE;
}
}
+
View
1 src/unix/X11/devX11.h
@@ -16,3 +16,4 @@ typedef enum {
Rboolean X11DeviceDriver(DevDesc*, char*, double, double, double, double,
X_COLORTYPE, int);
+
View
1 src/unix/X11/rbitmap.c
@@ -366,3 +366,4 @@ int R_SaveAsJpeg(void *d, int width, int height,
}
#endif /* HAVE_JPEG */
+
View
1 src/unix/X11/rotated.c
@@ -1452,3 +1452,4 @@ XPoint *XRotTextExtents(Display *dpy, XFontStruct *font, double angle,
return xp_out;
}
+
View
1 src/unix/X11/rotated.h
@@ -57,3 +57,4 @@ XPoint *XRotTextExtents(Display*, XFontStruct*, double,
+
View
1 src/unix/gnome/command-grep.c
@@ -78,3 +78,4 @@ void commands_grep_cb(GtkWidget *widget, gpointer data)
+
View
1 src/unix/gnome/command-grep.h
@@ -1,2 +1,3 @@
void commands_grep_cb(GtkWidget *widget, gpointer data);
+
View
1 src/unix/gnome/devGNOME.c
@@ -756,3 +756,4 @@ Rboolean GnomeDeviceDriver(DevDesc *dd, char *display,
/* finish */
return TRUE;
}
+
View
1 src/unix/gnome/devGNOME.h
@@ -20,3 +20,4 @@
Rboolean GnomeDeviceDriver(DevDesc *, char *, double, double, double);
+
View
1 src/unix/gnome/devGTK.c
@@ -1056,3 +1056,4 @@ GTKDeviceDriver(DevDesc *dd, char *display, double width,
return TRUE;
}
+
View
1 src/unix/gnome/devGTK.h
@@ -20,3 +20,4 @@
int X11DeviceDriver(DevDesc *, char *, double, double, double);
+
View
1 src/unix/gnome/gdkrotated.c
@@ -132,3 +132,4 @@ void gdk_draw_text_rot(GdkDrawable *drawable,
}
+
View
1 src/unix/gnome/gdkrotated.h
@@ -31,3 +31,4 @@ void gdk_draw_text_rot (GdkDrawable *drawable,
const gchar *text,
gint text_length,
double angle);
+
View
1 src/unix/gnome/gnome-find-dialog.c
@@ -578,3 +578,4 @@ static void close(GnomeFindDialog *find_dialog)
gnome_dialog_close(GNOME_DIALOG(find_dialog));
}
+
View
1 src/unix/gnome/gnome-find-dialog.h
@@ -111,3 +111,4 @@ gchar *gnome_find_dialog_get_find_text (GnomeFindDialog *dialog); /* returns
#endif /* __GNOME_FIND_DIALOG_H__ */
+
View
1 src/unix/gnome/gtkconsole.c
@@ -639,3 +639,4 @@ static void gtk_console_changed_post (GtkConsole *console)
}
+
View
1 src/unix/gnome/gtkconsole.h
@@ -116,3 +116,4 @@ gboolean gtk_console_get_input_enabled(GtkConsole *object);
#endif /* __GTK_CONSOLE_H__ */
+
View
1 src/unix/gnome/savehistory.c
@@ -53,3 +53,4 @@ void Rgnome_savehistory(SEXP call, SEXP op, SEXP args, SEXP env)
gtk_console_save_history(GTK_CONSOLE(R_gtk_terminal_text),
file, R_HistorySize, NULL);
}
+
View
1 src/unix/gnome/system-choosefile.c
@@ -94,3 +94,4 @@ int Rgnome_ChooseFile(int new, char *buf, int len)
return strlen(buf);
}
+
View
1 src/unix/gnome/system-console.c
@@ -92,3 +92,4 @@ void Rgnome_ClearerrConsole()
{
}
+
View
1 src/unix/gnome/system-showfiles.c
@@ -273,3 +273,4 @@ int Rgnome_ShowFiles(int nfile, char **file, char **title, char *wtitle,
return 0;
}
+
View
1 src/unix/gnome/system.c
@@ -345,3 +345,4 @@ SEXP do_syssleep(SEXP call, SEXP op, SEXP args, SEXP rho)
error("Sys.sleep is not implemented on this system");
return R_NilValue; /* -Wall */
}
+
View
1 src/unix/gnome/terminal-find.c
@@ -520,3 +520,4 @@ void R_gtk_terminal_find_init()
(GtkSignalFunc) find_console_changed,
NULL);
}
+
View
1 src/unix/gnome/terminal-find.h
@@ -24,3 +24,4 @@ void edit_find_cb(GtkWidget *widget, gpointer data);
void edit_find_again_cb(GtkWidget *widget, gpointer data);
void R_gtk_terminal_find_init();
+
View
1 src/unix/gnome/terminal-functions.c
@@ -212,3 +212,4 @@ void R_gtk_terminal_file_saveas(GtkWidget *widget, gpointer data)
void R_gtk_terminal_device_activate(gint devnum) {
}
+
View
1 src/unix/gnome/terminal-functions.h
@@ -19,3 +19,4 @@ void R_gtk_terminal_file_saveas(GtkWidget *widget,
gpointer data);
void R_gtk_terminal_file_open(GtkWidget *widget,
gpointer data);
+
View
1 src/unix/gnome/terminal-menu.c
@@ -366,3 +366,4 @@ void R_gtk_terminal_add_menu(GtkWidget *window)
gnome_app_install_menu_hints(GNOME_APP(window), main_menu);
}
+
View
1 src/unix/gnome/terminal-menu.h
@@ -2,3 +2,4 @@
void R_gtk_terminal_add_menu(GtkWidget *window);
+
View
1 src/unix/gnome/terminal-prefs.c
@@ -690,3 +690,4 @@ void settings_prefs_cb(GtkWidget *widget, gpointer data)
}
+
View
1 src/unix/gnome/terminal-prefs.h
@@ -55,3 +55,4 @@ GtkWidget *prefs_startup_page(void);
GtkWidget *prefs_pager_page(void);
void settings_prefs_cb(GtkWidget *widget, gpointer data);
+
View
1 src/unix/gnome/terminal-toolbar.c
@@ -63,3 +63,4 @@ void R_gtk_terminal_add_toolbar(GtkWidget *window)
gnome_app_create_toolbar(GNOME_APP(window), main_toolbar);
}
+
View
1 src/unix/gnome/terminal-toolbar.h
@@ -23,3 +23,4 @@
void R_gtk_terminal_add_toolbar(GtkWidget *window);
+
View
1 src/unix/gnome/terminal.c
@@ -129,3 +129,4 @@ void R_gtk_terminal_new()
/* finish up */
return;
}
+
View
1 src/unix/gnome/terminal.h
@@ -39,3 +39,4 @@ void terminal_set_style(void);
void R_gtk_terminal_new();
+

0 comments on commit d9ed7d8

Please sign in to comment.
Something went wrong with that request. Please try again.