aboutsummaryrefslogtreecommitdiff
path: root/util-linux/ipcrm.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-08-13 10:36:25 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-08-13 10:36:25 +0000
commite324184c0509cc0db168ce29546e1b52800a79c6 (patch)
tree9d4f18b3cc1ab715b6ff91cc9e3e942d11dfc51f /util-linux/ipcrm.c
parent5f1b149d541ebba7cab841cb647f113248f9fb8f (diff)
downloadbusybox-w32-e324184c0509cc0db168ce29546e1b52800a79c6.tar.gz
busybox-w32-e324184c0509cc0db168ce29546e1b52800a79c6.tar.bz2
busybox-w32-e324184c0509cc0db168ce29546e1b52800a79c6.zip
s/#ifdef CONFIG_/#if ENABLE_/g
Diffstat (limited to 'util-linux/ipcrm.c')
-rw-r--r--util-linux/ipcrm.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index 1e6206217..f49d28ee2 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -29,7 +29,10 @@ union semun {
29}; 29};
30#endif 30#endif
31 31
32#ifndef CONFIG_IPCRM_DROP_LEGACY 32#define IPCRM_LEGACY 1
33
34
35#if IPCRM_LEGACY
33 36
34typedef enum type_id { 37typedef enum type_id {
35 SHM, 38 SHM,
@@ -70,7 +73,7 @@ static int remove_ids(type_id type, int argc, char **argv)
70 73
71 return nb_errors; 74 return nb_errors;
72} 75}
73#endif /* #ifndef CONFIG_IPCRM_DROP_LEGACY */ 76#endif /* IPCRM_LEGACY */
74 77
75 78
76int ipcrm_main(int argc, char **argv); 79int ipcrm_main(int argc, char **argv);
@@ -82,7 +85,7 @@ int ipcrm_main(int argc, char **argv)
82 /* if the command is executed without parameters, do nothing */ 85 /* if the command is executed without parameters, do nothing */
83 if (argc == 1) 86 if (argc == 1)
84 return 0; 87 return 0;
85#ifndef CONFIG_IPCRM_DROP_LEGACY 88#if IPCRM_LEGACY
86 /* check to see if the command is being invoked in the old way if so 89 /* check to see if the command is being invoked in the old way if so
87 then run the old code. Valid commands are msg, shm, sem. */ 90 then run the old code. Valid commands are msg, shm, sem. */
88 { 91 {
@@ -113,7 +116,7 @@ int ipcrm_main(int argc, char **argv)
113 return 0; 116 return 0;
114 } 117 }
115 } 118 }
116#endif /* #ifndef CONFIG_IPCRM_DROP_LEGACY */ 119#endif /* IPCRM_LEGACY */
117 120
118 /* process new syntax to conform with SYSV ipcrm */ 121 /* process new syntax to conform with SYSV ipcrm */
119 while ((c = getopt(argc, argv, "q:m:s:Q:M:S:h?")) != -1) { 122 while ((c = getopt(argc, argv, "q:m:s:Q:M:S:h?")) != -1) {